Changeset 323 for trunk/src/lib/gl.cc

Timestamp:

08/26/14 04:03:10 (11 years ago)

Author:

epyon

Message:

• nova now compiles again under all three compilers with -Winsane and no warnings

File:

• trunk/src/lib/gl.cc (modified) (5 diffs)

trunk/src/lib/gl.cc

@@ -19 +19 @@
 // for wgl support
 #if NV_PLATFORM == NV_WINDOWS
-#    ifndef WIN32_LEAN_AND_MEAN
-#      define WIN32_LEAN_AND_MEAN 1
-#    endif
 #include <windows.h>
-#    undef WIN32_LEAN_AND_MEAN
-#endif
-
-// extern added for wgl needs only!
-#define NV_GL_FUN( rtype, fname, fparams ) extern "C" rtype (NV_GL_APIENTRY *fname) fparams = nullptr;
-#define NV_GL_FUN_REN( rtype, fname, rname, fparams ) extern "C" rtype (NV_GL_APIENTRY *rname) fparams = nullptr;
+#endif
+
+#define NV_GL_FUN( rtype, fname, fparams ) rtype (NV_GL_APIENTRY *fname) fparams = nullptr;
+#define NV_GL_FUN_REN( rtype, fname, rname, fparams ) rtype (NV_GL_APIENTRY *rname) fparams = nullptr;
 #define NV_GL_FUN_EXT NV_GL_FUN
 #include <nv/lib/detail/gl_functions.inc>
@@ -41 +36 @@
 static nv::library gl_library;
 static nv::gl_extensions gl_loaded_extensions = nv::gl_extensions(0);
-extern "C" void* (NV_GL_APIENTRY *gl_ext_loader) ( const char* ) = nullptr;
+static void* (NV_GL_APIENTRY *gl_ext_loader) ( const char* ) = nullptr;
 static bool gl_library_loaded = false;
 static bool wgl_library_loaded = false;
@@ -52 +47 @@
 };
 
-static const char *gl_extension_ids[] = {
-        "UNKNOWN",
-#define NV_GL_EXTENSION( count, id, name ) #id,
-#include <nv/lib/detail/gl_ext/gl_ext_info.inc>
-#undef NV_GL_EXTENSION
-};
+// static const char *gl_extension_ids[] = {
+//      "UNKNOWN",
+// #define NV_GL_EXTENSION( count, id, name ) #id,
+// #include <nv/lib/detail/gl_ext/gl_ext_info.inc>
+// #undef NV_GL_EXTENSION
+// };
 
 
@@ -184 +179 @@
         wndClass.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC;
 
-        DWORD err = GetLastError();
+        /*DWORD err = */GetLastError();
         RegisterClass(&wndClass);
-        err = GetLastError();
+        /*err = */GetLastError();
 
 
@@ -235 +230 @@
 }
 
-
 bool nv::load_gl_extension( gl_extensions extension )
 {