diff options
author | Brian <brian.paul@tungstengraphics.com> | 2007-09-20 15:11:14 -0600 |
---|---|---|
committer | Brian <brian.paul@tungstengraphics.com> | 2007-09-20 15:11:14 -0600 |
commit | a5467fbdd9ca599c9512433ece30f90fd67f15e3 (patch) | |
tree | 8bed869ce047e6c9e3bb1627bed19b1cc0bfd5b8 | |
parent | 58484dc00a30f6d0a0e43021283e1ce18ef4d5a3 (diff) |
fixes for bluegene-xlc-osmesa config
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | src/mesa/main/glheader.h | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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 fd4127558a..2d2da49fe5 100644 --- 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 |