summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKendall Bennett <KendallB@scitechsoft.com>1999-11-11 03:21:43 +0000
committerKendall Bennett <KendallB@scitechsoft.com>1999-11-11 03:21:43 +0000
commita73119234cc5d0b78ebd48c7bb7c43b755028836 (patch)
tree779e6e58ebad86bfac8f0a25b17e33cd759f3fbc /include
parentcb5ecb883eb3be842ef44c61df8d4b527877c858 (diff)
. 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.
Diffstat (limited to 'include')
-rw-r--r--include/GL/gl.h6
-rw-r--r--include/GL/glu.h4
2 files changed, 7 insertions, 3 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h
index 0ab6b2aa13..68fb1b3adb 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -1,4 +1,4 @@
-/* $Id: gl.h,v 1.18 1999/11/11 01:27:17 brianp Exp $ */
+/* $Id: gl.h,v 1.19 1999/11/11 03:21:43 kendallb Exp $ */
/*
* Mesa 3-D graphics library
@@ -77,14 +77,18 @@
# define WGLAPI __declspec(dllimport)
# endif /* _STATIC_MESA support */
# define GLAPIENTRY __stdcall
+# define GLAPIENTRYP __stdcall *
# define GLCALLBACK __stdcall
+# define GLCALLBACKP __stdcall *
# define GLWINAPI __stdcall
# define GLWINAPIV __cdecl
#else
/* non-Windows compilation */
# define GLAPI extern
# define GLAPIENTRY
+# define GLAPIENTRYP *
# define GLCALLBACK
+# define GLCALLBACKP *
# define GLWINAPI
# define GLWINAPIV
#endif /* WIN32 / CYGWIN32 bracket */
diff --git a/include/GL/glu.h b/include/GL/glu.h
index bfb9e90f66..1fb396b6f8 100644
--- a/include/GL/glu.h
+++ b/include/GL/glu.h
@@ -1,4 +1,4 @@
-/* $Id: glu.h,v 1.15 1999/11/11 01:27:17 brianp Exp $ */
+/* $Id: glu.h,v 1.16 1999/11/11 03:21:43 kendallb Exp $ */
/*
* Mesa 3-D graphics library
@@ -134,7 +134,7 @@ extern "C" {
/* NURBS */
#define GLU_AUTO_LOAD_MATRIX 100200
#define GLU_CULLING 100201
-#define GLU_PARAMETRIC_TOLERANC 100202
+#define GLU_PARAMETRIC_TOLERANCE 100202
#define GLU_SAMPLING_TOLERANCE 100203
#define GLU_DISPLAY_MODE 100204
#define GLU_SAMPLING_METHOD 100205