Changeset 3084 for trunk/src

Timestamp:

Mar 11, 2000, 4:08:37 PM (25 years ago)

Author:

sandervl

Message:

compile fixes

Location:

trunk/src/opengl/mesa/GL

Files:

• glu.h (modified) (5 diffs)
• glut.h (modified) (2 diffs)

trunk/src/opengl/mesa/GL/glu.h

@@ -1 @@
-/* $Id: glu.h,v 1.3 2000-03-11 09:05:07 jeroen Exp $ */
+/* $Id: glu.h,v 1.4 2000-03-11 15:08:36 sandervl Exp $ */
 
 /*
@@ -66 +66 @@
 #endif
 
+#undef GLCALLBACK
 #ifndef GLCALLBACK
-#define GLCALLBACK
+#define GLCALLBACK __stdcall
 #endif
 
@@ -361 +362 @@
 GLUAPI void GLAPIENTRY gluQuadricCallback( GLUquadricObj *qobj,
                                            GLenum which,
-                                           void (GLCALLBACK *fn)() );
+                                           void (* GLCALLBACK fn)() );
 
 GLUAPI void GLAPIENTRY gluCylinder( GLUquadricObj *qobj,
@@ -433 +434 @@
 
 GLUAPI void GLAPIENTRY gluNurbsCallback( GLUnurbsObj *nobj, GLenum which,
-                                       void (GLCALLBACK *fn)() );
+                                       void (* GLCALLBACK fn)() );
 
 GLUAPI GLboolean GLAPIENTRY gluCheckExtension(const GLubyte *extName,
@@ -468 +469 @@
 
 GLUAPI void GLAPIENTRY gluTessCallback( GLUtesselator *tobj, GLenum which,
-                                        void (GLCALLBACK *fn)() );
+                                        void (* GLCALLBACK fn)() );
 
 GLUAPI void GLAPIENTRY gluGetTessProperty( GLUtesselator *tobj, GLenum which,

trunk/src/opengl/mesa/GL/glut.h

@@ -1 @@
-/* $Id: glut.h,v 1.3 2000-03-11 09:05:07 jeroen Exp $ */
+/* $Id: glut.h,v 1.4 2000-03-11 15:08:37 sandervl Exp $ */
 #ifndef __glut_h__
 #define __glut_h__
@@ -454 +454 @@
 
 /* GLUT menu sub-API. */
-extern int GLAPIENTRY glutCreateMenu(void (*)(int));
+extern int GLAPIENTRY glutCreateMenu(void (* GLCALLBACK)(int));
 extern void GLAPIENTRY glutDestroyMenu(int menu);
 extern int GLAPIENTRY glutGetMenu(void);