diff options
| author | Brian Paul <[email protected]> | 2000-05-26 15:52:06 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2000-05-26 15:52:06 +0000 |
| commit | 1e0163272b8a7774db359b0d940d83a304efbd24 (patch) | |
| tree | e7214e96dd84b802731f039e7db8f9059cd36716 | |
| parent | 16541de30e48620e7dfe38147d4f7e8852af43d8 (diff) | |
applied Eero Pajarre's patch for Windows
| -rw-r--r-- | src/mesa/main/glheader.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index e80c548eab3..5fc9cff22ef 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -1,4 +1,4 @@ -/* $Id: glheader.h,v 1.9 2000/05/22 19:41:34 brianp Exp $ */ +/* $Id: glheader.h,v 1.10 2000/05/26 15:52:06 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -63,9 +63,6 @@ #include "conf.h" #endif -/* Make sure we include glext.h */ -#include "GL/gl.h" -#include "GL/glext.h" @@ -133,7 +130,9 @@ /* compatability guard so we don't need to change client code */ #if defined(_WIN32) && !defined(_WINDEF_) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP) +#if 0 # define CALLBACK GLCALLBACK +#endif typedef int (GLAPIENTRY *PROC)(); typedef void *HGLRC; typedef void *HDC; @@ -161,6 +160,12 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC +/* Make sure we include glext.h */ +#include "GL/gl.h" +#include "GL/glext.h" + + + /* Disable unreachable code warnings for Watcom C++ */ #ifdef __WATCOMC__ #pragma disable_message(201) |