diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-01-20 10:38:35 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-01-20 10:38:35 +1100 |
| commit | df09ed9d1ecf11be14ee7f189273c14375fbaa57 (patch) | |
| tree | 7322a2670877dff003f57a5485c9e92226b57167 /src/mesa/pipe/p_compiler.h | |
| parent | 0feec292ddc279998a1e25c10ea70d211f7b4b62 (diff) | |
| parent | a1f4a5e802ad62c88fca6834b9de1c83672230a6 (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Diffstat (limited to 'src/mesa/pipe/p_compiler.h')
| -rw-r--r-- | src/mesa/pipe/p_compiler.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/mesa/pipe/p_compiler.h b/src/mesa/pipe/p_compiler.h index 4f2c9ef88a..ab9609deab 100644 --- a/src/mesa/pipe/p_compiler.h +++ b/src/mesa/pipe/p_compiler.h @@ -50,6 +50,25 @@ typedef unsigned short ushort; typedef unsigned long long uint64; +#if defined(__MSC__) + +typedef unsigned short uint16_t; +typedef long int32_t; +typedef unsigned long uint32_t; +typedef long long int64_t; +typedef unsigned long long uint64_t; + +#if defined(_WIN64) +typedef unsigned __int64 uintptr_t; +#else +typedef unsigned int uintptr_t; +#endif + +#else +#include <stdint.h> +#endif + + #define TRUE 1 #define FALSE 0 |