From ee93b70033a44be1047dbf7b8236dae8a325dc96 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 12 Sep 2002 20:30:41 +0000
Subject: [PATCH] From Pavel Moloshtan, fixes for Mingw32 build.

---
 AUTHORS                  | 2 +-
 include/osg/GLExtensions | 4 ++--
 include/osg/Math         | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index d6b08c04a..e3a3a6d00 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -121,7 +121,7 @@ Ruben Lopez <ryu@gpul.org>
         - Inventor ascii/VRML 1.0 loader.
 
 Pavel Moloshtan <pasha@moloshtan.com>
-        - Support for LWO2 format in the light wave loader.
+        - Support for LWO2 format in the LightWave loader.
 
 Alberto Barbati <abarbati@iaanus.com>
         - lazy evaluation of the inverse in the MatrixTransform.
diff --git a/include/osg/GLExtensions b/include/osg/GLExtensions
index 522aba080..babb0621e 100644
--- a/include/osg/GLExtensions
+++ b/include/osg/GLExtensions
@@ -35,7 +35,7 @@ SG_EXPORT extern bool isGLExtensionSupported(const char *extension);
 inline void* getGLExtensionFuncPtr(const char *funcName)
 {
 #if defined(WIN32)
-    return wglGetProcAddress(funcName);
+    return (void*)wglGetProcAddress(funcName);
 #elif defined(__DARWIN_OSX__)
     std::string temp( "_" );
     temp += funcName;	// Mac OS X prepends an underscore on function names
@@ -79,7 +79,7 @@ SG_EXPORT extern bool isGLUExtensionSupported(const char *extension);
 inline void* getGLUExtensionFuncPtr(const char *funcName)
 {
 #if defined(WIN32)
-    return wglGetProcAddress(funcName);
+    return (void*)wglGetProcAddress(funcName);
 #elif defined(__DARWIN_OSX__)
     std::string temp( "_" );
     temp += funcName;	// Mac OS X prepends an underscore on function names
diff --git a/include/osg/Math b/include/osg/Math
index 8a4aaa1be..0b9eaa4fd 100644
--- a/include/osg/Math
+++ b/include/osg/Math
@@ -12,9 +12,10 @@
 #endif
 
 
-#if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) ) || \
+#if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) && !defined(__MINGW32__) ) || \
     defined (sun) || \
     defined (__DARWIN_OSX__)
+    
 
     #include <float.h>
 
@@ -57,7 +58,7 @@
 
 #endif
 
-#if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) ) || \
+#if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) && !defined(__MINGW32__) ) || \
     defined (sun)
 
     #ifndef isnanf
@@ -66,7 +67,7 @@
 
 #endif
 
-#if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) ) || \
+#if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) && !defined(__MINGW32__) ) || \
     defined (sun) || \
     defined (__hpux__)