Win32 fixes, etc. (Gerk Huisma)

4 files changed, 30 insertions, 14 deletions

diff --git a/src/glu/sgi/libnurbs/interface/glcurveval.cc b/src/glu/sgi/libnurbs/interface/glcurveval.cc
index a33b71119ae..620526fea40 100644
--- a/src/glu/sgi/libnurbs/interface/glcurveval.cc
+++ b/src/glu/sgi/libnurbs/interface/glcurveval.cc
@@ -35,8 +35,8 @@
 /*
  * glcurveval.c++
  *
- * $Date: 2001/07/18 11:17:35 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glcurveval.cc,v 1.2 2001/07/18 11:17:35 joukj Exp $
+ * $Date: 2001/08/07 17:34:10 $ $Revision: 1.3 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glcurveval.cc,v 1.3 2001/08/07 17:34:10 brianp Exp $
  */
 
 /* Polynomial Evaluator Interface */
@@ -300,7 +300,11 @@ void OpenGLCurveEvaluator::evalcoord1f(long, REAL u)
 }
 
 void
-OpenGLCurveEvaluator::putCallBack(GLenum which, _GLUfuncptr fn )
+#ifdef _WIN32
+OpenGLCurveEvaluator::putCallBack(GLenum which, void (GLAPIENTRY *fn)())
+#else
+OpenGLCurveEvaluator::putCallBack(GLenum which, _GLUfuncptr fn)
+#endif
 {
   switch(which)
   {
diff --git a/src/glu/sgi/libnurbs/interface/glcurveval.h b/src/glu/sgi/libnurbs/interface/glcurveval.h
index c6780281c1b..861118b4b6f 100644
--- a/src/glu/sgi/libnurbs/interface/glcurveval.h
+++ b/src/glu/sgi/libnurbs/interface/glcurveval.h
@@ -35,16 +35,16 @@
 /*
  * glcurveval.h
  *
- * $Date: 2001/07/17 15:39:13 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glcurveval.h,v 1.3 2001/07/17 15:39:13 brianp Exp $
+ * $Date: 2001/08/07 17:34:11 $ $Revision: 1.4 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glcurveval.h,v 1.4 2001/08/07 17:34:11 brianp Exp $
  */
 
 #ifndef __gluglcurveval_h_
 #define __gluglcurveval_h_
 
 #include "gluos.h"
-#include "GL/gl.h"
-#include "GL/glu.h"
+#include <GL/gl.h>
+#include <GL/glu.h>
 #include "basiccrveval.h"
 
 class CurveMap;
@@ -94,7 +94,11 @@ public:
       {
 	output_triangles = flag;
       }
+#ifdef _WIN32
+    void               putCallBack(GLenum which, void (APIENTRY *fn)() );
+#else
     void               putCallBack(GLenum which, _GLUfuncptr fn );
+#endif
     void               set_callback_userData(void *data)
       {
 	userData = data;
diff --git a/src/glu/sgi/libnurbs/interface/glrenderer.h b/src/glu/sgi/libnurbs/interface/glrenderer.h
index 12402a0ea55..8773afcda30 100644
--- a/src/glu/sgi/libnurbs/interface/glrenderer.h
+++ b/src/glu/sgi/libnurbs/interface/glrenderer.h
@@ -35,8 +35,8 @@
 /*
  * glrenderer.h
  *
- * $Date: 2001/07/16 15:46:42 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glrenderer.h,v 1.2 2001/07/16 15:46:42 brianp Exp $
+ * $Date: 2001/08/07 17:34:11 $ $Revision: 1.3 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glrenderer.h,v 1.3 2001/08/07 17:34:11 brianp Exp $
  */
 
 #ifndef __gluglrenderer_h_
@@ -73,8 +73,11 @@ public:
     void	(APIENTRY *errorCallback)( GLenum );
     void	postError( int which ) 
 		    { if (errorCallback) (errorCallback)( (GLenum)which ); }
-
+#ifdef _WIN32
+    void        putSurfCallBack(GLenum which, void (GLAPIENTRY *fn)() )
+#else
     void        putSurfCallBack(GLenum which, _GLUfuncptr fn )
+#endif
       {
 	curveEvaluator.putCallBack(which, fn);
 	surfaceEvaluator.putCallBack(which, fn);
diff --git a/src/glu/sgi/libnurbs/interface/glsurfeval.h b/src/glu/sgi/libnurbs/interface/glsurfeval.h
index a20fb9acc5e..8f95e2e48ec 100644
--- a/src/glu/sgi/libnurbs/interface/glsurfeval.h
+++ b/src/glu/sgi/libnurbs/interface/glsurfeval.h
@@ -35,8 +35,8 @@
 /*
  * glsurfeval.h
  *
- * $Date: 2001/07/17 15:39:13 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glsurfeval.h,v 1.3 2001/07/17 15:39:13 brianp Exp $
+ * $Date: 2001/08/07 17:34:11 $ $Revision: 1.4 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glsurfeval.h,v 1.4 2001/08/07 17:34:11 brianp Exp $
  */
 
 #ifndef __gluglsurfeval_h_
@@ -44,8 +44,8 @@
 
 #include "basicsurfeval.h"
 #include "bezierPatchMesh.h" //in case output triangles
-#include "GL/gl.h"
-#include "GL/glu.h"
+#include <GL/gl.h>
+#include <GL/glu.h>
 
 class SurfaceMap;
 class OpenGLSurfaceEvaluator;
@@ -146,7 +146,12 @@ public:
     void		newtmeshvert( REAL, REAL );
     void		newtmeshvert( long, long );
 
+#ifdef _WIN32
+    void 	        putCallBack(GLenum which, void (APIENTRY *fn)() );
+#else
     void 	        putCallBack(GLenum which, _GLUfuncptr fn );
+#endif
+
     int                 get_vertices_call_back()
       {
 	return output_triangles;