diff options
Diffstat (limited to 'src/glu/mesa/quadric.c')
| -rw-r--r-- | src/glu/mesa/quadric.c | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/src/glu/mesa/quadric.c b/src/glu/mesa/quadric.c index 4698e795b1..8bdf7cc085 100644 --- a/src/glu/mesa/quadric.c +++ b/src/glu/mesa/quadric.c @@ -1,4 +1,4 @@ -/* $Id: quadric.c,v 1.1 1999/08/19 00:55:42 jtg Exp $ */ +/* $Id: quadric.c,v 1.2 1999/11/11 03:21:43 kendallb Exp $ */ /* * Mesa 3-D graphics library @@ -23,8 +23,25 @@ /* * $Log: quadric.c,v $ - * Revision 1.1 1999/08/19 00:55:42 jtg - * Initial revision + * Revision 1.2 1999/11/11 03:21:43 kendallb + * + * . Updated GL/gl.h with GLCALLACKP and GLAPIENTRYP macros for compatibility + * with the IBM VisualAge C++ compiler. Eventually some more code will be + * needed in the headers to enable the reversal of (__stdcall*) to (*__stdcall) + * for the IBM compilers, however we currently build using our own header files + * that already handle this. + * + * . Changed instances of (GLCALLBACK*) to GLCALLBACKP for compatibility + * with the IBM VisualAge C++ compiler in src-glu. + * + * . Misc cleanups for warnings generated with Watcom C++ in src-glu. Compiles + * with 0 warnings now. + * + * . tess_hash.c: line 244 - Why is this function stubbed out? I removed the + * code with a #if 0 to avoid a compiler warning, but it looks dangerous. + * + * Revision 1.1.1.1 1999/08/19 00:55:42 jtg + * Imported sources * * Revision 1.19 1999/02/27 13:55:31 brianp * fixed BeOS-related GLU typedef problems @@ -105,17 +122,6 @@ -#ifndef M_PI -# define M_PI (3.1415926) -#endif - - -/* - * Convert degrees to radians: - */ -#define DEG_TO_RAD(A) ((A)*(M_PI/180.0)) - - /* * Sin and Cos for degree angles: */ @@ -135,7 +141,7 @@ struct GLUquadric { GLenum Orientation; /* GLU_INSIDE or GLU_OUTSIDE */ GLboolean TextureFlag; /* Generate texture coords? */ GLenum Normals; /* GLU_NONE, GLU_FLAT, or GLU_SMOOTH */ - void (GLCALLBACK *ErrorFunc)(GLenum err); /* Error handler callback function */ + void (GLCALLBACKP ErrorFunc)(GLenum err); /* Error handler callback function */ }; @@ -221,7 +227,7 @@ void GLAPIENTRY gluQuadricOrientation( GLUquadricObj *quadObject, * Set the error handler callback function. */ void GLAPIENTRY gluQuadricCallback( GLUquadricObj *qobj, - GLenum which, void (GLCALLBACK *fn)() ) + GLenum which, void (GLCALLBACKP fn)() ) { /* * UGH, this is a mess! I thought ANSI was a standard. @@ -232,13 +238,13 @@ void GLAPIENTRY gluQuadricCallback( GLUquadricObj *qobj, #elif defined(OPENSTEP) qobj->ErrorFunc = (void(*)(GLenum))fn; #elif defined(_WIN32) - qobj->ErrorFunc = (void(GLCALLBACK*)(int))fn; + qobj->ErrorFunc = (void(GLCALLBACKP)(int))fn; #elif defined(__STORM__) - qobj->ErrorFunc = (void(GLCALLBACK*)(GLenum))fn; + qobj->ErrorFunc = (void(GLCALLBACKP)(GLenum))fn; #elif defined(__BEOS__) qobj->ErrorFunc = (void(*)(GLenum))fn; #else - qobj->ErrorFunc = (void(GLCALLBACK*)())fn; + qobj->ErrorFunc = (void(GLCALLBACKP)())fn; #endif } } |