diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-05-14 23:11:12 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-05-14 23:11:12 +0000 |
| commit | 0ab16e01348a8feceda9ee55f14b035e400d3c01 (patch) | |
| tree | a48d883fe84f5ac2e4bc8edff078fad97648bf2c /src/mesa/main | |
| parent | 649971518c6b79bc510d3a15b025250a7f947def (diff) | |
New IFLOOR, ICEIL macros from Josh Vanderhoof. Fixes problems with
IFLOOR(1.99999)==2, for example. Moved some macros from config.h to glheader.h
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/config.h | 34 | ||||
| -rw-r--r-- | src/mesa/main/glheader.h | 27 |
2 files changed, 28 insertions, 33 deletions
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h index 4a10ffa5f1..cf57106a33 100644 --- a/src/mesa/main/config.h +++ b/src/mesa/main/config.h @@ -1,4 +1,4 @@ -/* $Id: config.h,v 1.30 2001/05/14 16:25:18 brianp Exp $ */ +/* $Id: config.h,v 1.31 2001/05/14 23:11:12 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -179,34 +179,4 @@ #define ACOMP 3 - -/* - * Language/compiler stuff - */ - -/* Some compilers don't like some of Mesa's const usage */ -#ifdef NO_CONST -# define CONST -#else -# define CONST const -#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 +#endif /* CONFIG_H */ diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index 394ce24dae..0324b42ffd 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -1,4 +1,4 @@ -/* $Id: glheader.h,v 1.19 2001/03/29 16:50:32 brianp Exp $ */ +/* $Id: glheader.h,v 1.20 2001/05/14 23:11:12 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -216,5 +216,30 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC #endif +/* Function inlining */ +#if defined(__GNUC__) +# define INLINE __inline__ +#elif defined(__MSC__) +# define INLINE __inline +#else +# define INLINE +#endif + + +/* Some compilers don't like some of Mesa's const usage */ +#ifdef NO_CONST +# define CONST +#else +# define CONST const +#endif + + +#ifdef DEBUG +# define ASSERT(X) assert(X) +#else +# define ASSERT(X) +#endif + + #endif /* GLHEADER_H */ |