9 files changed, 37 insertions, 33 deletions
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 55fe26181ed..5d07bf3ae00 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1,4 +1,4 @@
-/* $Id: osmesa.c,v 1.22 2000/09/28 22:44:31 brianp Exp $ */
+/* $Id: osmesa.c,v 1.23 2000/10/29 18:23:28 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -42,6 +42,7 @@
 #include "GL/osmesa.h"
 #include "context.h"
 #include "depth.h"
+#include "macros.h"
 #include "mem.h"
 #include "matrix.h"
 #include "types.h"
diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c
index 43cf7574cd1..315efe932b6 100644
--- a/src/mesa/main/accum.c
+++ b/src/mesa/main/accum.c
@@ -1,4 +1,4 @@
-/* $Id: accum.c,v 1.28 2000/10/28 18:34:48 brianp Exp $ */
+/* $Id: accum.c,v 1.29 2000/10/29 18:23:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -31,6 +31,7 @@
 #include "glheader.h"
 #include "accum.h"
 #include "context.h"
+#include "macros.h"
 #include "mem.h"
 #include "masking.h"
 #include "span.h"
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index a45f652a3d1..f727c141c1a 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -1,4 +1,4 @@
-/* $Id: config.h,v 1.22 2000/10/29 18:12:14 brianp Exp $ */
+/* $Id: config.h,v 1.23 2000/10/29 18:23:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -197,6 +197,10 @@
 #define VB_SIZE  (VB_MAX + VB_MAX_CLIPPED_VERTS)
 
 
+/*
+ * Language/compiler stuff
+ */
+
 /* Some compilers don't like some of Mesa's const usage */
 #ifdef NO_CONST
 #  define CONST
@@ -205,4 +209,21 @@
 #endif
 
 
+/* Function inlining */
+#if defined(__GNUC__)
+#  define INLINE __inline__
+#elif defined(__MSC__)
+#  define INLINE __inline
+#else
+#  define INLINE
+#endif
+
+
+#ifdef DEBUG
+#  define ASSERT(X)   assert(X)
+#else
+#  define ASSERT(X)
+#endif
+
+
 #endif
diff --git a/src/mesa/main/depth.c b/src/mesa/main/depth.c
index 5f113447e7f..c5e113e4e73 100644
--- a/src/mesa/main/depth.c
+++ b/src/mesa/main/depth.c
@@ -1,4 +1,4 @@
-/* $Id: depth.c,v 1.19 2000/09/26 20:53:53 brianp Exp $ */
+/* $Id: depth.c,v 1.20 2000/10/29 18:23:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -32,6 +32,7 @@
 #include "context.h"
 #include "enums.h"
 #include "depth.h"
+#include "macros.h"
 #include "mem.h"
 #include "pb.h"
 #include "types.h"
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index 05c80d1a15c..45bb9cd226f 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -1,4 +1,4 @@
-/* $Id: macros.h,v 1.11 2000/10/28 20:41:14 brianp Exp $ */
+/* $Id: macros.h,v 1.12 2000/10/29 18:23:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -37,35 +37,11 @@
 #include "glheader.h"
 
 
-#ifdef DEBUG
-#  define ASSERT(X)   assert(X)
-#else
-#  define ASSERT(X)
-#endif
-
-
-#if defined(__GNUC__)
-#define INLINE __inline__
-#elif defined(__MSC__)
-#define INLINE __inline
-#else
-#define INLINE
-#endif
-
-
 /* Limits: */
 #define MAX_GLUSHORT	0xffff
 #define MAX_GLUINT	0xffffffff
 
 
-/* Some compilers don't like some of Mesa's const usage */
-#ifdef NO_CONST
-#  define CONST
-#else
-#  define CONST const
-#endif
-
-
 /* Pi */
 #ifndef M_PI
 #define M_PI (3.1415926)
diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index 2d9d857a2f9..fe8d433110c 100644
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -1,4 +1,4 @@
-/* $Id: matrix.c,v 1.21 2000/09/26 20:53:53 brianp Exp $ */
+/* $Id: matrix.c,v 1.22 2000/10/29 18:23:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -42,6 +42,7 @@
 #include "buffers.h"
 #include "context.h"
 #include "enums.h"
+#include "macros.h"
 #include "matrix.h"
 #include "mem.h"
 #include "mmath.h"
diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c
index bc14fed08da..a2c8bf4e957 100644
--- a/src/mesa/main/stencil.c
+++ b/src/mesa/main/stencil.c
@@ -1,4 +1,4 @@
-/* $Id: stencil.c,v 1.19 2000/09/26 20:53:53 brianp Exp $ */
+/* $Id: stencil.c,v 1.20 2000/10/29 18:23:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -31,6 +31,7 @@
 #include "glheader.h"
 #include "context.h"
 #include "depth.h"
+#include "macros.h"
 #include "mem.h"
 #include "pb.h"
 #include "stencil.h"
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 718e561cf67..570ecdc01cd 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1,4 +1,4 @@
-/* $Id: teximage.c,v 1.54 2000/10/29 18:12:15 brianp Exp $ */
+/* $Id: teximage.c,v 1.55 2000/10/29 18:23:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -32,6 +32,7 @@
 #include "context.h"
 #include "convolve.h"
 #include "image.h"
+#include "macros.h"
 #include "mem.h"
 #include "mmath.h"
 #include "span.h"
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 36a63f63ac5..62238ff6fd4 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1,4 +1,4 @@
-/* $Id: texobj.c,v 1.29 2000/10/24 02:53:18 brianp Exp $ */
+/* $Id: texobj.c,v 1.30 2000/10/29 18:23:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -33,6 +33,7 @@
 #include "context.h"
 #include "enums.h"
 #include "hash.h"
+#include "macros.h"
 #include "mem.h"
 #include "teximage.h"
 #include "texstate.h"