diff options
| author | Ben Skeggs <[email protected]> | 2008-07-23 14:05:22 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-07-23 14:05:22 +1000 |
| commit | 704dca40c4e0e983c07d84c3a32f8f9dc78a5543 (patch) | |
| tree | bdcc585315d88274ec795b7206a143d562f54a76 /include/GL/glxext.h | |
| parent | 0c25ac52425e6d6eb037b99ab90f41b47e3f4491 (diff) | |
| parent | 7f3d6e74817e8880a0712c85f2b41fd88cf6a347 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'include/GL/glxext.h')
| -rw-r--r-- | include/GL/glxext.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/GL/glxext.h b/include/GL/glxext.h index 0f66df6277a..aedc311cbf4 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> |