summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Schultz <kschultz@freedesktop.org>2002-10-17 19:39:31 +0000
committerKarl Schultz <kschultz@freedesktop.org>2002-10-17 19:39:31 +0000
commit3e2fa3fd5cafdc641138844276c4260e028684ac (patch)
tree79ac52161e441573b1291199e892f8750ad0d80f
parentbc36ee25d88b8330237490a2a803d8fd7f790e7a (diff)
Change for Windows only: Make demos and examples build again.
Move the inclusion of windows.h from glext.h to gl.h. There are a few good reasons for this: - Including it in gl.h is more strightforward and makes it easier to troubleshoot include file problems. It was sometimes hard to find it in glext.h. - Needed to define APIENTRY correctly. APIENTRY is used in gl.h. - glut.h needs windows.h but does not include it, expecting the app to include it. Including it in gl.h if not already included by the app makes glut.h happy. This allows one to write a gl/glut app without explictly including windows.h, which may only be really important for toy apps like our samples and demos. But a "real" app can still include windows.h if it wants.
-rw-r--r--include/GL/gl.h15
-rw-r--r--include/GL/glext.h5
2 files changed, 14 insertions, 6 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h
index bced617f15..44254a77ff 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -1,4 +1,4 @@
-/* $Id: gl.h,v 1.71 2002/09/21 16:47:09 brianp Exp $ */
+/* $Id: gl.h,v 1.72 2002/10/17 19:39:31 kschultz Exp $ */
/*
* Mesa 3-D graphics library
@@ -67,6 +67,19 @@
# define PRAGMA_EXPORT_SUPPORTED 1
#endif
+/*
+ * WINDOWS: Include windows.h here to define APIENTRY.
+ * It is also useful when applications include this file by
+ * including only glut.h, since glut.h depends on windows.h.
+ * Applications needing to include windows.h with parms other
+ * than "WIN32_LEAN_AND_MEAN" may include windows.h before
+ * glut.h or gl.h.
+ */
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) && !defined(__CYGWIN__)
#include <gl/mesa_wgl.h>
#endif
diff --git a/include/GL/glext.h b/include/GL/glext.h
index 245f100c70..f88d7e79b3 100644
--- a/include/GL/glext.h
+++ b/include/GL/glext.h
@@ -34,11 +34,6 @@ extern "C" {
** version 1.2.1 Specification.
*/
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
#ifndef APIENTRY
#define APIENTRY
#endif