diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 1999-11-17 21:19:48 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 1999-11-17 21:19:48 +0000 |
| commit | 36d8d7ae815dc78e56ab64379d86f9e85b4d1c63 (patch) | |
| tree | 4092de47d146261397be91238db06cd08df8b93c /include/GL/mesa_wgl.h | |
| parent | 80e872df2b1ed10751a99e56f8f2f342be1438e7 (diff) | |
fixed some glitches (Eero Pajarre)
Diffstat (limited to 'include/GL/mesa_wgl.h')
| -rw-r--r-- | include/GL/mesa_wgl.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/include/GL/mesa_wgl.h b/include/GL/mesa_wgl.h index 40bbe57354..36215e81d5 100644 --- a/include/GL/mesa_wgl.h +++ b/include/GL/mesa_wgl.h @@ -1,10 +1,17 @@ /* prototypes for the Mesa WGL functions */
/* relocated here so that I could make GLUT get them properly */
-#ifndef GL_H
-# include <gl/gl.h>
+#ifndef _mesa_wgl_h_
+#define _mesa_wgl_h_
+
+
+#include <gl/gl.h>
+
+#ifdef __cplusplus
+extern "C" {
#endif
+
#ifdef _MSC_VER
# pragma warning( push )
# pragma warning( disable : 4273 ) /* 'function' : inconsistent DLL linkage. dllexport assumed. */
@@ -37,10 +44,17 @@ WGLAPI int GLAPIENTRY wglUseFontOutlinesA(HDC, unsigned long, unsigned long, u WGLAPI int GLAPIENTRY wglUseFontOutlinesW(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);
WGLAPI int GLAPIENTRY SwapBuffers(HDC);
WGLAPI int GLAPIENTRY ChoosePixelFormat(HDC,const PIXELFORMATDESCRIPTOR *);
-WGLAPI int GLAPIENTRY DescribePixelFormat(HDC,int,unsigned int,PIXELFORMATDESCRIPTOR *);
+WGLAPI int GLAPIENTRY DescribePixelFormat(HDC,int,unsigned int,LPPIXELFORMATDESCRIPTOR);
WGLAPI int GLAPIENTRY GetPixelFormat(HDC);
WGLAPI int GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *);
#ifdef _MSC_VER
# pragma warning( pop )
#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _mesa_wgl_h_ */
|