diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-03-20 17:54:44 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-03-20 17:54:44 +0000 |
| commit | 4f030d12ad7c3a05922b108302b854816ce6afb1 (patch) | |
| tree | a8a5474cb47c5d00c5167c35ead69faa70480276 /include/GL | |
| parent | 792837dafd185687ffdaf9d91b30cc48c45107c0 (diff) | |
patched for Cygwin (Sven Panne)
Diffstat (limited to 'include/GL')
| -rw-r--r-- | include/GL/gl.h | 8 | ||||
| -rw-r--r-- | include/GL/glut.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h index 5b11aeabf6..07e2bbc6e8 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -1,4 +1,4 @@ -/* $Id: gl.h,v 1.17.2.5 2000/02/10 17:21:30 brianp Exp $ */ +/* $Id: gl.h,v 1.17.2.6 2000/03/20 17:54:44 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -94,7 +94,7 @@ /* compatability guard so we don't need to change client code */ -#if defined(_WIN32) && !defined(_WINDEF_) && !defined(OPENSTEP) +#if defined(_WIN32) && !defined(_WINDEF_) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP) # define CALLBACK GLCALLBACK typedef int (GLAPIENTRY *PROC)(); typedef void *HGLRC; @@ -102,9 +102,10 @@ typedef void *HDC; typedef unsigned long COLORREF; #endif -#if defined(_WIN32) && !defined(_WINGDI_) && !defined(OPENSTEP) +#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) # define WGL_FONT_LINES 0 # define WGL_FONT_POLYGONS 1 +#ifndef _GNU_H_WINDOWS32_FUNCTIONS # ifdef UNICODE # define wglUseFontBitmaps wglUseFontBitmapsW # define wglUseFontOutlines wglUseFontOutlinesW @@ -112,6 +113,7 @@ typedef unsigned long COLORREF; # define wglUseFontBitmaps wglUseFontBitmapsA # define wglUseFontOutlines wglUseFontOutlinesA # endif /* !UNICODE */ +#endif /* _GNU_H_WINDOWS32_FUNCTIONS */ typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR; typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT; typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR; diff --git a/include/GL/glut.h b/include/GL/glut.h index 225bb87e52..20605cb358 100644 --- a/include/GL/glut.h +++ b/include/GL/glut.h @@ -108,7 +108,7 @@ extern _CRTIMP void __cdecl exit(int); and redifinition of Windows system defs, also removes requirement of pretty much any standard windows header from this file */ -#if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) +#if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__CYGWIN32__) # define GLUTAPIENTRY __stdcall #else # define GLUTAPIENTRY |