Minor patches to cleanup some compiler warnings in MSVC

1 files changed, 15 insertions, 2 deletions

diff --git a/include/GL/mesa_wgl.h b/include/GL/mesa_wgl.h
index afa70d2c62f..40bbe573542 100644
--- a/include/GL/mesa_wgl.h
+++ b/include/GL/mesa_wgl.h
@@ -2,7 +2,12 @@
 /* relocated here so that I could make GLUT get them properly */

 

 #ifndef GL_H

-#include <gl/gl.h>

+#   include <gl/gl.h>

+#endif

+

+#ifdef _MSC_VER

+#  pragma warning( push )

+#  pragma warning( disable : 4273 ) /* 'function' : inconsistent DLL linkage. dllexport assumed. */

 #endif

 

 WGLAPI int   GLAPIENTRY wglDeleteContext(HGLRC);

@@ -14,7 +19,6 @@ WGLAPI HGLRC GLAPIENTRY wglCreateContext(HDC);
 WGLAPI HGLRC GLAPIENTRY wglCreateLayerContext(HDC,int);

 WGLAPI HGLRC GLAPIENTRY wglGetCurrentContext(void);

 WGLAPI PROC  GLAPIENTRY wglGetProcAddress(const char*);

-WGLAPI int   GLAPIENTRY SwapBuffers(HDC);

 WGLAPI int   GLAPIENTRY wglChoosePixelFormat(HDC, const PIXELFORMATDESCRIPTOR *);

 WGLAPI int   GLAPIENTRY wglCopyContext(HGLRC, HGLRC, unsigned int);

 WGLAPI int   GLAPIENTRY wglDeleteContext(HGLRC);

@@ -31,3 +35,12 @@ WGLAPI int   GLAPIENTRY wglUseFontBitmapsA(HDC, unsigned long, unsigned long, un
 WGLAPI int   GLAPIENTRY wglUseFontBitmapsW(HDC, unsigned long, unsigned long, unsigned long);

 WGLAPI int   GLAPIENTRY wglUseFontOutlinesA(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);

 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 GetPixelFormat(HDC);

+WGLAPI int   GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *);

+

+#ifdef _MSC_VER

+#  pragma warning( pop )

+#endif