Merge remote-tracking branch 'mesa/12.0' into marshmallow-x86

[android-x86/external-mesa.git] / src / gallium / auxiliary / util / u_math.h

diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
index 14fbb58..55343e8 100644 (file)
--- a/src/gallium/auxiliary/util/u_math.h
+++ b/src/gallium/auxiliary/util/u_math.h
@@ -42,7 +42,9 @@
 #include "pipe/p_compiler.h"
 
 #include "c99_math.h"
+#ifndef assert
 #include <assert.h>
+#endif
 #include <float.h>
 #include <stdarg.h>