[Mesa-dev] [PATCH v2 11/15] android: avoid building errors with stlport

Chih-Wei Huang cwhuang at android-x86.org
Tue May 19 20:25:35 PDT 2015

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 <cwhuang at 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>
 struct list_head

More information about the mesa-dev mailing list