summaryrefslogtreecommitdiff
path: root/include/GL/glu.h
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-05-22 16:21:27 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-05-22 16:21:27 +0000
commit08f0374bfaccc41a497f18a6535fa0d13277abde (patch)
tree222cf9e69f678ab3ef0002feb09ca87d7e32b23e /include/GL/glu.h
parentdec7e16cc0a97ecb1999649c58cdbf8c1e3340eb (diff)
moved a lot of Window-isms out of gl.h into other files
Diffstat (limited to 'include/GL/glu.h')
-rw-r--r--include/GL/glu.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/include/GL/glu.h b/include/GL/glu.h
index 5acd0b7392..249e37d16c 100644
--- a/include/GL/glu.h
+++ b/include/GL/glu.h
@@ -1,4 +1,4 @@
-/* $Id: glu.h,v 1.19 1999/11/24 13:06:48 brianp Exp $ */
+/* $Id: glu.h,v 1.20 2000/05/22 16:21:27 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -47,10 +47,21 @@ extern "C" {
# else /* for use with static link lib build of Win32 edition only */
# define GLUAPI extern
# endif /* _STATIC_MESA support */
+# define GLCALLBACK __stdcall
+# define GLCALLBACKP __stdcall *
#else
# define GLUAPI extern
+# define GLCALLBACK
+# define GLCALLBACKP *
#endif /* WIN32 / CYGWIN32 bracket */
+/* compatability guard so we don't need to change client code */
+#if defined(_WIN32) && !defined(_WINDEF_) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP)
+# define CALLBACK GLCALLBACK
+#endif
+
+
+
#ifdef macintosh
#pragma enumsalwaysint on
#if PRAGMA_IMPORT_SUPPORTED