summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/glheader.h
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2000-08-02 00:41:21 +0000
committerBrian Paul <[email protected]>2000-08-02 00:41:21 +0000
commit00277e836df1048eb39940e83d59cd3149a374a1 (patch)
tree302ef951a16f7205619a53932ff05284efb37599 /src/mesa/main/glheader.h
parent6d04725282f32cbd32acbc8b79294a2a056b2158 (diff)
define GL_GLEXT_PROTOTYPES before including mesa_wgl.h
Diffstat (limited to 'src/mesa/main/glheader.h')
-rw-r--r--src/mesa/main/glheader.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 643d052bc12..e1272172f60 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -1,8 +1,8 @@
-/* $Id: glheader.h,v 1.11 2000/06/12 15:40:47 brianp Exp $ */
+/* $Id: glheader.h,v 1.12 2000/08/02 00:41:21 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.3
+ * Version: 3.5
*
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
*
@@ -139,6 +139,11 @@ typedef void *HDC;
typedef unsigned long COLORREF;
#endif
+
+/* Make sure we include glext.h from gl.h */
+#define GL_GLEXT_PROTOTYPES
+
+
#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP)
# define WGL_FONT_LINES 0
# define WGL_FONT_POLYGONS 1
@@ -160,8 +165,6 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC
-/* Make sure we include glext.h */
-#define GL_GLEXT_PROTOTYPES
#include "GL/gl.h"
#include "GL/glext.h"