Minor patches to cleanup some compiler warnings in MSVC

diff --git a/include/GL/gl.h b/include/GL/gl.h
index d5a93878bbe7a5560f74dd11304abbae2ed8501b..eeec8afc5c26349dce5e1ba793d22ec0a4f5a9bc 100644 (file)
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -1,4 +1,4 @@
-/* $Id: gl.h,v 1.13 1999/10/17 23:24:49 brianp Exp $ */
+/* $Id: gl.h,v 1.14 1999/10/20 06:56:40 tjump Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -55,6 +55,7 @@
 #      pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */
 #      pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */
 #      pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
+#  pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */
 #      if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
 #              define GLAPI __declspec(dllexport)
 #     define WGLAPI __declspec(dllexport)
@@ -114,7 +115,6 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC
 #include <gl/mesa_wgl.h>
 #endif
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/include/GL/glut.h b/include/GL/glut.h
index 1b7fc43667b1060cd4d3b85b495df97794d4c88f..0c17f65b2cd4ff2ea52b10b61d7cb8c03cdea2b3 100644 (file)
--- a/include/GL/glut.h
+++ b/include/GL/glut.h
@@ -152,26 +152,42 @@ typedef unsigned long COLORREF;
 #              define wglUseFontOutlines  wglUseFontOutlinesA
 #      endif /* !UNICODE */
 typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR;
-typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT;
-GLUTAPI int   GLUTAPIENTRY wglCopyContext(HGLRC, HGLRC, unsigned int);
-GLUTAPI HGLRC GLUTAPIENTRY wglCreateContext(HDC);
-GLUTAPI HGLRC GLUTAPIENTRY wglCreateLayerContext(HDC, int);
-GLUTAPI int   GLUTAPIENTRY wglDeleteContext(HGLRC);
-GLUTAPI HGLRC GLUTAPIENTRY wglGetCurrentContext(void);
-GLUTAPI HDC   GLUTAPIENTRY wglGetCurrentDC(void);
-GLUTAPI PROC  GLUTAPIENTRY wglGetProcAddress(char*);
-GLUTAPI int   GLUTAPIENTRY wglMakeCurrent(HDC, HGLRC);
-GLUTAPI int   GLUTAPIENTRY wglShareLists(HGLRC, HGLRC);
-GLUTAPI int   GLUTAPIENTRY wglUseFontBitmapsA(HDC, unsigned long, unsigned long, unsigned long);
-GLUTAPI int   GLUTAPIENTRY wglUseFontBitmapsW(HDC, unsigned long, unsigned long, unsigned long);
-GLUTAPI int   GLUTAPIENTRY wglUseFontOutlinesA(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);
-GLUTAPI int   GLUTAPIENTRY wglUseFontOutlinesW(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);
-GLUTAPI int   GLUTAPIENTRY wglDescribeLayerPlane(HDC, int, int, unsigned int,LPLAYERPLANEDESCRIPTOR);
-GLUTAPI int   GLUTAPIENTRY wglSetLayerPaletteEntries(HDC, int, int, int,const COLORREF *);
-GLUTAPI int   GLUTAPIENTRY wglGetLayerPaletteEntries(HDC, int, int, int,COLORREF *);
-GLUTAPI int   GLUTAPIENTRY wglRealizeLayerPalette(HDC, int, int);
-GLUTAPI int   GLUTAPIENTRY wglSwapLayerBuffers(HDC, unsigned int);
-GLUTAPI int   GLUTAPIENTRY SwapBuffers(HDC);
+typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT
+#  pragma warning( push )
+#  pragma warning( disable : 4273 ) /* 'function' : inconsistent DLL linkage. dllexport assumed. */
+#  define WGLAPI __declspec(dllimport)
+WGLAPI int   GLAPIENTRY wglDeleteContext(HGLRC);
+WGLAPI int   GLAPIENTRY wglMakeCurrent(HDC,HGLRC);
+WGLAPI int   GLAPIENTRY wglSetPixelFormat(HDC, int, const PIXELFORMATDESCRIPTOR *);
+WGLAPI int   GLAPIENTRY wglSwapBuffers(HDC hdc);
+WGLAPI HDC   GLAPIENTRY wglGetCurrentDC(void);
+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 wglChoosePixelFormat(HDC, const PIXELFORMATDESCRIPTOR *);
+WGLAPI int   GLAPIENTRY wglCopyContext(HGLRC, HGLRC, unsigned int);
+WGLAPI int   GLAPIENTRY wglDeleteContext(HGLRC);
+WGLAPI int   GLAPIENTRY wglDescribeLayerPlane(HDC, int, int, unsigned int,LPLAYERPLANEDESCRIPTOR);
+WGLAPI int   GLAPIENTRY wglDescribePixelFormat(HDC,int, unsigned int, LPPIXELFORMATDESCRIPTOR);
+WGLAPI int   GLAPIENTRY wglGetLayerPaletteEntries(HDC, int, int, int,COLORREF *);
+WGLAPI int   GLAPIENTRY wglGetPixelFormat(HDC hdc);
+WGLAPI int   GLAPIENTRY wglMakeCurrent(HDC, HGLRC);
+WGLAPI int   GLAPIENTRY wglRealizeLayerPalette(HDC, int, int);
+WGLAPI int   GLAPIENTRY wglSetLayerPaletteEntries(HDC, int, int, int,const COLORREF *);
+WGLAPI int   GLAPIENTRY wglShareLists(HGLRC, HGLRC);
+WGLAPI int   GLAPIENTRY wglSwapLayerBuffers(HDC, unsigned int);
+WGLAPI int   GLAPIENTRY wglUseFontBitmapsA(HDC, unsigned long, unsigned long, unsigned long);
+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 long,LPPIXELFORMATDESCRIPTOR);
+WGLAPI int   GLAPIENTRY GetPixelFormat(HDC);
+WGLAPI int   GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *);
+#  undef WGLAPI
+#  pragma warning( pop )
 #endif
 
 #else /* _WIN32 not defined */

diff --git a/include/GL/mesa_wgl.h b/include/GL/mesa_wgl.h
index afa70d2c62f23ddfdd49f9cdd823a760263d6a95..40bbe57354237e4579b10f262e1da9bfe9d6ce4f 100644 (file)
--- 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 */\r
 \r
 #ifndef GL_H\r
-#include <gl/gl.h>\r
+#   include <gl/gl.h>\r
+#endif\r
+\r
+#ifdef _MSC_VER\r
+#  pragma warning( push )\r
+#  pragma warning( disable : 4273 ) /* 'function' : inconsistent DLL linkage. dllexport assumed. */\r
 #endif\r
 \r
 WGLAPI int   GLAPIENTRY wglDeleteContext(HGLRC);\r
@@ -14,7 +19,6 @@ WGLAPI HGLRC GLAPIENTRY wglCreateContext(HDC);
 WGLAPI HGLRC GLAPIENTRY wglCreateLayerContext(HDC,int);\r
 WGLAPI HGLRC GLAPIENTRY wglGetCurrentContext(void);\r
 WGLAPI PROC  GLAPIENTRY wglGetProcAddress(const char*);\r
-WGLAPI int   GLAPIENTRY SwapBuffers(HDC);\r
 WGLAPI int   GLAPIENTRY wglChoosePixelFormat(HDC, const PIXELFORMATDESCRIPTOR *);\r
 WGLAPI int   GLAPIENTRY wglCopyContext(HGLRC, HGLRC, unsigned int);\r
 WGLAPI int   GLAPIENTRY wglDeleteContext(HGLRC);\r
@@ -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);\r
 WGLAPI int   GLAPIENTRY wglUseFontOutlinesA(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);\r
 WGLAPI int   GLAPIENTRY wglUseFontOutlinesW(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);\r
+WGLAPI int   GLAPIENTRY SwapBuffers(HDC);\r
+WGLAPI int   GLAPIENTRY ChoosePixelFormat(HDC,const PIXELFORMATDESCRIPTOR *);\r
+WGLAPI int   GLAPIENTRY DescribePixelFormat(HDC,int,unsigned int,PIXELFORMATDESCRIPTOR *);\r
+WGLAPI int   GLAPIENTRY GetPixelFormat(HDC);\r
+WGLAPI int   GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *);\r
+\r
+#ifdef _MSC_VER\r
+#  pragma warning( pop )\r
+#endif\r

diff --git a/src/mesa/drivers/glide/fxwgl.c b/src/mesa/drivers/glide/fxwgl.c
index 3ba7f7a4b4d244f7f11bc946487246a17911f5d9..7b19176c7efdaeb3ed01cf17d28a6904a66de1b4 100644 (file)
--- a/src/mesa/drivers/glide/fxwgl.c
+++ b/src/mesa/drivers/glide/fxwgl.c
@@ -28,14 +28,14 @@ extern "C" {
 #endif
 
 #include <windows.h>
-#include <GL/gl.h>
+#include "GL/gl.h"
 
 #ifdef __cplusplus
            }
 #endif
 
 #include <stdio.h>
-#include <GL/fxmesa.h>
+#include "GL/fxmesa.h"
 #include "fxdrv.h"
 
 #define MAX_MESA_ATTRS  20
@@ -542,7 +542,7 @@ BOOL GLAPIENTRY wglUseFontBitmaps(HDC fontDevice, DWORD firstChar, DWORD numChar
   SetTextColor(bitDevice, tempColor);
 
   // Place chars based on base line
-  VERIFY(SetTextAlign(bitDevice, TA_BASELINE) >= 0);
+  VERIFY(SetTextAlign(bitDevice, TA_BASELINE) >= 0 ? 1 : 0);
 
   for(i = 0; i < numChars; i++) {
     SIZE size;