summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/macros.h
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>1999-10-08 09:27:09 +0000
committerKeith Whitwell <[email protected]>1999-10-08 09:27:09 +0000
commit485f04074151686fa24d40e3eeb83029d3d8c425 (patch)
treed74a44fb266d6534fbbc060be7658f9deefea538 /src/mesa/main/macros.h
parenta7313e045dfd1ab439e8e01664d402ea9ce0a37e (diff)
Fixed includes & added a few hooks for the DRI.kw-mesa-1
Diffstat (limited to 'src/mesa/main/macros.h')
-rw-r--r--src/mesa/main/macros.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index 61e89748369..e47b85ff8bc 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -1,4 +1,4 @@
-/* $Id: macros.h,v 1.1 1999/08/19 00:55:41 jtg Exp $ */
+/* $Id: macros.h,v 1.2 1999/10/08 09:27:11 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -36,9 +36,12 @@
#ifndef MACROS_H
#define MACROS_H
-
+#if defined( XFree86LOADER ) && defined( XFree86Server )
+#include <GL/glx_ansic.h>
+#else
#include <math.h>
#include <string.h>
+#endif
#ifdef DEBUG
@@ -49,7 +52,7 @@
#endif
-#if defined(__GNUC__) || defined(__MWERKS__)
+#if defined(__GNUC__)
#define INLINE __inline__
#elif defined(__MSC__)
#define INLINE __inline