summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/windows
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2004-11-08 15:08:48 +0000
committerBrian Paul <[email protected]>2004-11-08 15:08:48 +0000
commit83889ffd970a807074d834849677fd233c031dc7 (patch)
treef048187a4bcbc88b0e73dd028830f30642447602 /src/mesa/drivers/windows
parent5849e3d353d956643dd40a3d5f53c31e79ae8cf0 (diff)
Remove need for defining _MSC_VER when building Mesa for windows with
a non MS C compiler (MinGW). (Gregor Anich)
Diffstat (limited to 'src/mesa/drivers/windows')
-rw-r--r--src/mesa/drivers/windows/gdi/wmesa.c6
-rw-r--r--src/mesa/drivers/windows/gdi/wmesadef.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/drivers/windows/gdi/wmesa.c b/src/mesa/drivers/windows/gdi/wmesa.c
index 96cfafff4c3..acd5f4a34fb 100644
--- a/src/mesa/drivers/windows/gdi/wmesa.c
+++ b/src/mesa/drivers/windows/gdi/wmesa.c
@@ -18,7 +18,7 @@
* Updated for Mesa 4.0 by Karl Schultz ([email protected])
*/
-#ifdef NDEBUG
+#if defined(NDEBUG) && defined(_MSC_VER)
#pragma auto_inline(on)
#pragma inline_depth(255)
#pragma inline_recursion(on)
@@ -74,7 +74,7 @@
/* Stereo and parallel not tested for Mesa 4.0. */
#define NO_STEREO
#if !defined(NO_STEREO)
-#include "gl\glu.h"
+#include "GL/glu.h"
#include "stereo.h"
#endif
@@ -114,6 +114,8 @@ WMesaContext WC = NULL;
#if defined(_MSC_VER) && _MSC_VER >= 1200
#define FORCEINLINE __forceinline
+#elif defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
+#define FORCEINLINE __attribute__((always_inline))
#else
#define FORCEINLINE __inline
#endif
diff --git a/src/mesa/drivers/windows/gdi/wmesadef.h b/src/mesa/drivers/windows/gdi/wmesadef.h
index 3c267aa0f6a..d43e990ed3c 100644
--- a/src/mesa/drivers/windows/gdi/wmesadef.h
+++ b/src/mesa/drivers/windows/gdi/wmesadef.h
@@ -70,7 +70,7 @@
#include <windows.h>
-#include <GL\gl.h>
+#include <GL/gl.h>
#include "context.h"
#ifdef DDRAW
#define DIRECTDRAW_VERSION 0x0100