Module: Mesa
Branch: master
Commit: 46f453b29890afebb49daa04e0dbeadc45e662c2
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=46f453b29890afebb49daa04e0dbeadc45e662c2

Author: Alan Hourihane <al...@vmware.com>
Date:   Tue Jan 26 20:57:03 2010 +0000

Check for __USE_MISC for defining uint & ushort

---

 src/gallium/include/pipe/p_compiler.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/include/pipe/p_compiler.h 
b/src/gallium/include/pipe/p_compiler.h
index 272d030..6a9018a 100644
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -63,7 +63,7 @@
 #include <stdbool.h>
 
 
-#ifndef __HAIKU__
+#if !defined(__HAIKU__) && !defined(__USE_MISC)
 typedef unsigned int       uint;
 typedef unsigned short     ushort;
 #endif

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to