diff options
author | Ted Jump <[email protected]> | 1999-10-20 06:56:40 +0000 |
---|---|---|
committer | Ted Jump <[email protected]> | 1999-10-20 06:56:40 +0000 |
commit | 3f17dfb8ba48d874814ce0e4a0b7d9e57feb4c36 (patch) | |
tree | 1b41492c6bb5c76d71517a87546596cdea521fd9 /include/GL/gl.h | |
parent | d53573daf7bb53a41c9307339d70cfbba4f3b7a5 (diff) |
Minor patches to cleanup some compiler warnings in MSVC
Diffstat (limited to 'include/GL/gl.h')
-rw-r--r-- | include/GL/gl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h index d5a93878bbe..eeec8afc5c2 100644 --- 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 |