From 6d2d63a8e13bdf33cdd11ae83d533c836c07afa0 Mon Sep 17 00:00:00 2001 From: Gregor Anich Date: Fri, 16 Jul 2004 22:54:48 +0000 Subject: [PATCH] Fix unknown pragma warnings and gl.h include for linux builds. svn path=/trunk/; revision=10155 --- reactos/lib/mesa32/include/GL/wmesa.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/reactos/lib/mesa32/include/GL/wmesa.h b/reactos/lib/mesa32/include/GL/wmesa.h index dc1ec89d2b1..5b6868526c2 100644 --- a/reactos/lib/mesa32/include/GL/wmesa.h +++ b/reactos/lib/mesa32/include/GL/wmesa.h @@ -50,17 +50,19 @@ extern "C" { #endif -#include "gl\gl.h" +#include "GL/gl.h" -#pragma warning (disable:4273) -#pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */ -#pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */ -#pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */ -#pragma warning( disable : 4013 ) /* 'function' undefined; assuming extern returning int */ -#pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */ -#pragma warning( disable : 4273 ) /* 'identifier' : inconsistent DLL linkage. dllexport assumed */ -#if (MESA_WARNQUIET>1) +#if !defined(__GNUC__) +# pragma warning (disable:4273) +# pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */ +# pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */ +# pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */ +# pragma warning( disable : 4013 ) /* 'function' undefined; assuming extern returning int */ +# pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */ +# pragma warning( disable : 4273 ) /* 'identifier' : inconsistent DLL linkage. dllexport assumed */ +# if (MESA_WARNQUIET>1) # pragma warning( disable : 4146 ) /* unary minus operator applied to unsigned type, result still unsigned */ +# endif #endif /*