diff options
| author | Daniel Borca <[email protected]> | 2003-11-18 12:18:13 +0000 |
|---|---|---|
| committer | Daniel Borca <[email protected]> | 2003-11-18 12:18:13 +0000 |
| commit | ef563d011b5a11dc5f7a0da6445e68f14cc33062 (patch) | |
| tree | b61e2f338d71c77f3a9a565f146efc9070c5317e /src/mesa/drivers/glide/fxwgl.c | |
| parent | aa0d6dcd652ca3f6ece2e9314020283589d79a2a (diff) | |
doc updates; GLUT timer additions; fixed compilation warnings
Diffstat (limited to 'src/mesa/drivers/glide/fxwgl.c')
| -rw-r--r-- | src/mesa/drivers/glide/fxwgl.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/mesa/drivers/glide/fxwgl.c b/src/mesa/drivers/glide/fxwgl.c index 308cb9ba76e..4609880f8d3 100644 --- a/src/mesa/drivers/glide/fxwgl.c +++ b/src/mesa/drivers/glide/fxwgl.c @@ -57,6 +57,11 @@ extern "C" #define MAX_MESA_ATTRS 20 +#if (_MSC_VER >= 1200) +#pragma warning( push ) +#pragma warning( disable : 4273 ) +#endif + struct __extensions__ { PROC proc; @@ -69,7 +74,7 @@ struct __pixelformat__ GLint mesaAttr[MAX_MESA_ATTRS]; }; -//WINGDIAPI void GLAPIENTRY gl3DfxSetPaletteEXT(GLuint *); +WINGDIAPI void GLAPIENTRY gl3DfxSetPaletteEXT(GLuint *); struct __pixelformat__ pix[] = { /* 16bit RGB565 single buffer with depth */ @@ -866,7 +871,7 @@ wglDescribeLayerPlane(HDC hdc, int iPixelFormat, int iLayerPlane, GLAPI int GLAPIENTRY wglGetLayerPaletteEntries(HDC hdc, int iLayerPlane, int iStart, - int cEntries, CONST COLORREF *pcr) + int cEntries, COLORREF *pcr) { SetLastError(0); return (FALSE); @@ -887,4 +892,8 @@ wglSetLayerPaletteEntries(HDC hdc,int iLayerPlane, int iStart, return(FALSE); } +#if (_MSC_VER >= 1200) +#pragma warning( pop ) +#endif + #endif /* FX */ |