diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2008-07-25 18:31:44 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2008-07-25 18:31:44 -0700 |
| commit | 1e645b365900cf1c71ca5594bd6b549a1f203040 (patch) | |
| tree | d114e55df428550c9829acf929b9fb7bcb89c429 /src/mesa/main/glheader.h | |
| parent | e5022c3fdf9888857f22f9a1690035ff3f90d36b (diff) | |
| parent | 9bc9e0ecb0fb2069b2c123e665eb2118e358098f (diff) | |
Merge branch 'master' into drm-gem
Conflicts:
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
Diffstat (limited to 'src/mesa/main/glheader.h')
| -rw-r--r-- | src/mesa/main/glheader.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index 533e4a2bd8..6f3b2089c3 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -72,6 +72,12 @@ # if _MSC_VER == 1200 typedef UINT_PTR uintptr_t; # endif +#elif defined(__INTERIX) +/* Interix 3.x has a gcc that shadows this. */ +# ifndef _UINTPTR_T_DEFINED + typedef unsigned long uintptr_t; +# define _UINTPTR_T_DEFINED +# endif #else # include <inttypes.h> #endif |