The gallium debugging helpers have defined the assert macro.
It causes some errors when build with Android stlport.

To workaround it, do not include assert.h if the assert macro
has been defined.

Signed-off-by: Chih-Wei Huang <cwhu...@linux.org.tw>
---
 src/util/list.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/util/list.h b/src/util/list.h
index 9460347..0ba883a 100644
--- a/src/util/list.h
+++ b/src/util/list.h
@@ -40,7 +40,9 @@
 
 #include <stdbool.h>
 #include <stddef.h>
+#ifndef assert
 #include <assert.h>
+#endif
 
 
 struct list_head
-- 
1.9.1

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

Reply via email to