diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2004-12-14 09:11:52 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2004-12-14 09:11:52 +0000 |
| commit | 38b317d508a2a3a4cc6d700ebca80c3b06c913e2 (patch) | |
| tree | 017e198082e3b2c633beef5a69f9d9088124b37a /include/GL | |
| parent | 9fb024ba970b808d357a00ab7b8739a78559b39e (diff) | |
uint*t -> u_int*t changes
Diffstat (limited to 'include/GL')
| -rw-r--r-- | include/GL/glxext.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/GL/glxext.h b/include/GL/glxext.h index f1e253a0c77..880f2f30f04 100644 --- a/include/GL/glxext.h +++ b/include/GL/glxext.h @@ -331,6 +331,15 @@ typedef struct { } GLXBufferClobberEventSGIX; #endif +#if defined(__UNIXOS2__) || defined(__SOL64__) +typedef long int int32_t; +typedef long long int int64_t; +#endif + +#if defined(__SCO__) || defined(__USLC__) +#include <stdint.h> +#endif + #ifndef GLX_VERSION_1_3 #define GLX_VERSION_1_3 1 #ifdef GLX_GLXEXT_PROTOTYPES @@ -597,11 +606,6 @@ typedef Bool ( * PFNGLXSET3DFXMODEMESAPROC) (int mode); #ifndef GLX_OML_sync_control #define GLX_OML_sync_control 1 -#if defined(__STDC_VERSION__) -#if __STDC_VERSION__ >= 199901L -/* Include ISO C99 integer types for OML_sync_control; need a better test */ -#include <inttypes.h> - #ifdef GLX_GLXEXT_PROTOTYPES extern Bool glXGetSyncValuesOML (Display *, GLXDrawable, int64_t *, int64_t *, int64_t *); extern Bool glXGetMscRateOML (Display *, GLXDrawable, int32_t *, int32_t *); @@ -614,8 +618,6 @@ typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (Display *dpy, GLXDrawable drawable, i typedef int64_t ( * PFNGLXSWAPBUFFERSMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder); typedef Bool ( * PFNGLXWAITFORMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc); typedef Bool ( * PFNGLXWAITFORSBCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_sbc, int64_t *ust, int64_t *msc, int64_t *sbc); -#endif /* C99 version test */ -#endif /* STDC test */ #endif #ifndef GLX_SGIX_hyperpipe_group @@ -673,7 +675,6 @@ extern unsigned int glXGetAGPOffsetMESA (const void *); typedef unsigned int ( * PFNGLXGETAGPOFFSETMESAPROC) (const void *pointer); #endif - #ifdef __cplusplus } #endif |