fixes for bluegene-xlc-osmesa config

diff --git a/Makefile b/Makefile
index 59e6d8251169986433c69ea6039ebbebc41c0db8..ef607f4944ce6db27fdf36270ee4e284ba6bcfeb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,7 @@ aix-64-static \
 aix-gcc \
 aix-static \
 bluegene-osmesa \
+bluegene-xlc-osmesa \
 beos \
 darwin \
 darwin-static \

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index fd4127558a839e4d53bd550e971decc0a994798e..2d2da49fe5b75b17622ab49df8fc687ad0e4704c 100644 (file)
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -237,7 +237,7 @@
 #endif
 
 
-#if !defined __GNUC__ || __GNUC__ < 3
+#if (!defined(__GNUC__) || __GNUC__ < 3) && !defined(__IBMC__)
 #  define __builtin_expect(x, y) x
 #endif