diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-09 09:00:58 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-09 09:00:58 -0600 |
| commit | 7bf63473623e01933adc0e8f4464eda8f2860564 (patch) | |
| tree | 4cfb1b611c999c4b158e6809ee78a02e4d7698b5 /src/gallium/include/pipe/p_compiler.h | |
| parent | 94a8157ef6bf6695cdc66325c9a7698e64f3e37e (diff) | |
| parent | 0c309bb494b6ee1c403442d1207743f749f95b6e (diff) | |
Merge branch 'mesa_7_6_branch'
Diffstat (limited to 'src/gallium/include/pipe/p_compiler.h')
| -rw-r--r-- | src/gallium/include/pipe/p_compiler.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h index e6a67f8c2f..c13cffceb0 100644 --- a/src/gallium/include/pipe/p_compiler.h +++ b/src/gallium/include/pipe/p_compiler.h @@ -93,9 +93,11 @@ typedef int _Bool; #endif +#ifndef __HAIKU__ typedef unsigned int uint; -typedef unsigned char ubyte; typedef unsigned short ushort; +#endif +typedef unsigned char ubyte; #if 0 #define boolean bool |