From ebb248aa5c018dc676d389221d76ed329059789e Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sun, 29 Oct 2000 18:23:16 +0000
Subject: more minor header file re-org (moved CONST, ASSERT, INLINE to
 config.h)

---
 src/mesa/main/macros.h | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

(limited to 'src/mesa/main/macros.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)
-- 
cgit v1.2.3