diff options
| author | Blair Sadewitz <blair.sadewitz@gmail.com> | 2008-07-15 17:21:43 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-07-15 17:30:51 -0600 |
| commit | 99233e483d38aedb929ceff3f2ebc9340b42eb3a (patch) | |
| tree | 502fc94698fcc1443587c2778fe725121ac9976b | |
| parent | b4adb9e1de6728febbb758d6633edf765868153e (diff) | |
additional preprocessor checks for stdint.h, inttypes.h, etc
The patches to glext.h and glxext.h have been sent to Khronos/bugzilla.
| -rw-r--r-- | include/GL/glext.h | 8 | ||||
| -rw-r--r-- | include/GL/glxext.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/GL/glext.h b/include/GL/glext.h index 2519a6cc5e..6ecb44affb 100644 --- a/include/GL/glext.h +++ b/include/GL/glext.h @@ -3416,16 +3416,16 @@ typedef unsigned short GLhalfNV; #endif #ifndef GLEXT_64_TYPES_DEFINED -/* This code block is duplicated in glext.h, so must be protected */ +/* This code block is duplicated in glxext.h, so must be protected */ #define GLEXT_64_TYPES_DEFINED /* Define int32_t, int64_t, and uint64_t types for UST/MSC */ /* (as used in the GL_EXT_timer_query extension). */ #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L #include <inttypes.h> -#elif defined(__sun__) +#elif defined(__sun__) || defined(__digital__) #include <inttypes.h> #if defined(__STDC__) -#if defined(__arch64__) +#if defined(__arch64__) || defined(_LP64) typedef long int int64_t; typedef unsigned long int uint64_t; #else @@ -3433,7 +3433,7 @@ typedef long long int int64_t; typedef unsigned long long int uint64_t; #endif /* __arch64__ */ #endif /* __STDC__ */ -#elif defined( __VMS ) +#elif defined( __VMS ) || defined(__sgi) #include <inttypes.h> #elif defined(__SCO__) || defined(__USLC__) #include <stdint.h> diff --git a/include/GL/glxext.h b/include/GL/glxext.h index 0f66df6277..aedc311cbf 100644 --- a/include/GL/glxext.h +++ b/include/GL/glxext.h @@ -380,7 +380,7 @@ typedef struct { #endif #ifndef GLEXT_64_TYPES_DEFINED -/* This code block is duplicated in glxext.h, so must be protected */ +/* This code block is duplicated in glext.h, so must be protected */ #define GLEXT_64_TYPES_DEFINED /* Define int32_t, int64_t, and uint64_t types for UST/MSC */ /* (as used in the GLX_OML_sync_control extension). */ @@ -389,7 +389,7 @@ typedef struct { #elif defined(__sun__) || defined(__digital__) #include <inttypes.h> #if defined(__STDC__) -#if defined(__arch64__) +#if defined(__arch64__) || defined(_LP64) typedef long int int64_t; typedef unsigned long int uint64_t; #else @@ -397,7 +397,7 @@ typedef long long int int64_t; typedef unsigned long long int uint64_t; #endif /* __arch64__ */ #endif /* __STDC__ */ -#elif defined( __VMS ) +#elif defined( __VMS ) || defined(__sgi) #include <inttypes.h> #elif defined(__SCO__) || defined(__USLC__) #include <stdint.h> |