diff options
| author | Brian Paul <[email protected]> | 1999-11-12 18:23:47 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 1999-11-12 18:23:47 +0000 |
| commit | 2da507defd5783d5e666e4902015f0a2dd11100b (patch) | |
| tree | a7b1261a031ba9775e7b37ea8778251eb87d1f62 | |
| parent | 93b76c048f064455b42c345dc204b94065ad197c (diff) | |
moved assembly-related macros from types.h to glheader.h
| -rw-r--r-- | src/mesa/main/glheader.h | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index ea1a6b985f3..7041f7985ac 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -1,4 +1,4 @@ -/* $Id: glheader.h,v 1.2 1999/11/12 16:46:56 kendallb Exp $ */ +/* $Id: glheader.h,v 1.3 1999/11/12 18:23:47 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -61,11 +61,49 @@ #include <GL/gl.h> -/* Disable unreachable code warnings for Watcom C++ */ +/* + * Put compiler/OS/assembly pragmas and macros here to avoid + * cluttering other source files. + */ + + +/* Disable unreachable code warnings for Watcom C++ */ #ifdef __WATCOMC__ #pragma disable_message(201) #endif +/* Turn off macro checking systems used by other libraries */ +#ifdef CHECK +#undef CHECK +#endif + + +/* Create a macro so that asm functions can be linked into compilers other + * than GNU C + */ +#ifndef _ASMAPI +#if !defined( __GNUC__ ) && !defined( VMS ) +#define _ASMAPI __cdecl +#else +#define _ASMAPI +#endif +#ifdef PTR_DECL_IN_FRONT +#define _ASMAPIP * _ASMAPI +#else +#define _ASMAPIP _ASMAPI * +#endif +#endif + +#ifdef USE_X86_ASM +#define _NORMAPI _ASMAPI +#define _NORMAPIP _ASMAPIP +#else +#define _NORMAPI +#define _NORMAPIP * #endif + + + +#endif /* GLHEADER_H */ |