diff options
| author | Michal Krol <michal@vmware.com> | 2009-09-14 11:22:05 +0200 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-09-14 11:22:05 +0200 |
| commit | 9f273f109875cd9208d4c1c8f5939fb5e507c230 (patch) | |
| tree | 35c8adedcf44cf8eb3bddbb51b5efa766539a07b /src/gallium/include/pipe/p_compiler.h | |
| parent | fab99092a0879531442d1dd20f971ae7eda824eb (diff) | |
| parent | aad0deee4b2d347bdfc536fe98938ed825bf0f6b (diff) | |
Merge commit 'origin/master' into glsl-pp-rework-2
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 |