File 0905-wx-Fix-windows-compiler-warnings.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0905-wx-Fix-windows-compiler-warnings.patch of Package erlang (Revision 6a6e740c0161086d7407fd293e77c355)

Currently displaying revision 6a6e740c0161086d7407fd293e77c355 , Show latest

From d70ad005133214c4d6f6f649d3fed54baef65dce Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Fri, 24 Apr 2020 11:08:58 +0200
Subject: [PATCH 6/7] wx: Fix windows compiler warnings

---
 lib/wx/c_src/egl_impl.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/wx/c_src/egl_impl.cpp b/lib/wx/c_src/egl_impl.cpp
index 61e05ee6f1..06c1de9cb6 100644
--- a/lib/wx/c_src/egl_impl.cpp
+++ b/lib/wx/c_src/egl_impl.cpp
@@ -48,6 +48,7 @@ int egl_initiated = 0;
 #define OPENGLU_LIB L"glu32.dll"
 typedef HMODULE DL_LIB_P;
 typedef WCHAR DL_CHAR;
+#define DL_STR_FMT "%S"
 void * dlsym(HMODULE Lib, const char *func) {
   void * funcp;
   if((funcp = (void *) GetProcAddress(Lib, func)))
@@ -67,6 +68,7 @@ void dlclose(HMODULE Lib) {
 #else
 typedef void * DL_LIB_P;
 typedef char DL_CHAR;
+# define DL_STR_FMT "%s"
 # ifdef _MACOSX
 #  define OPENGL_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
 #  define OPENGLU_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib"
@@ -125,7 +127,7 @@ int load_gl_functions() {
     // dlclose(LIBhandle);
     // fprintf(stderr, "OPENGL library is loaded\r\n");
   } else {
-    fprintf(stderr, "Could NOT load OpenGL library: %s\r\n", DLName);
+    fprintf(stderr, "Could NOT load OpenGL library: " DL_STR_FMT "\r\n", DLName);
   };
 
   DLName = (DL_CHAR *) OPENGLU_LIB;
@@ -154,7 +156,7 @@ int load_gl_functions() {
     // dlclose(LIBhandle);
     // fprintf(stderr, "GLU library is loaded\r\n");
   } else {
-    fprintf(stderr, "Could NOT load OpenGL GLU library: %s\r\n", DLName);
+    fprintf(stderr, "Could NOT load OpenGL GLU library: " DL_STR_FMT "\r\n", DLName);
   };
 
   return 1;
-- 
2.26.1

Places

File 0905-wx-Fix-windows-compiler-warnings.patch of Package erlang (Revision 6a6e740c0161086d7407fd293e77c355)

Places