summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/macros.h
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>1999-11-08 15:29:43 +0000
committerBrian Paul <[email protected]>1999-11-08 15:29:43 +0000
commitc00c0b323fd46385faaa75395553247ed089eaba (patch)
tree57362eb52bb2ec0799fcd7b4f6771fecad2c7f3b /src/mesa/main/macros.h
parent99f16d01dd508ccac9d37488bf83a7aed5c05832 (diff)
header includes clean-up (Daryll)
Diffstat (limited to 'src/mesa/main/macros.h')
-rw-r--r--src/mesa/main/macros.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index a9443c5c603..bba09837215 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -1,4 +1,4 @@
-/* $Id: macros.h,v 1.5 1999/10/13 18:42:50 brianp Exp $ */
+/* $Id: macros.h,v 1.6 1999/11/08 15:29:43 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -36,16 +36,16 @@
#ifndef MACROS_H
#define MACROS_H
-#if defined( XFree86LOADER ) && defined( XFree86Server )
-#include <GL/glx_ansic.h>
-#else
+#ifndef XFree86Server
+#include <assert.h>
#include <math.h>
#include <string.h>
+#else
+#include <GL/glx_ansic.h>
#endif
#ifdef DEBUG
-# include <assert.h>
# define ASSERT(X) assert(X)
#else
# define ASSERT(X)