diff options
| author | José Fonseca <jrfonseca@tungstengraphics.com> | 2008-01-17 13:39:14 +0900 |
|---|---|---|
| committer | José Fonseca <jrfonseca@tungstengraphics.com> | 2008-01-17 13:39:14 +0900 |
| commit | 271f9dac79a9247de9a57f4d248e404bf1652a13 (patch) | |
| tree | 70e049d11449f2d41a7e27076995d86827e46be7 /src/mesa/pipe/p_compiler.h | |
| parent | b016f0adba8278f3744d3aaa207a1b586d51756d (diff) | |
Back-port miscellaneous fixes from internal branch (mostly portability fixes).
These are changes that are in our internal branch, but somehow were skipped
so far. It was done using visual comparison of the branches --
it is likely that changes are being carried on the wrong way
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 |