diff options
| author | Jouk <joukj@tarantella.nano.tudelft.nl> | 2007-10-02 15:17:23 +0200 |
|---|---|---|
| committer | Jouk <joukj@tarantella.nano.tudelft.nl> | 2007-10-02 15:17:23 +0200 |
| commit | 584b84256b07e106cd7295495355eb21226465d7 (patch) | |
| tree | 028d47d265d01f3f96787792fbd41d495d60856c /src/mesa/main/glheader.h | |
| parent | eb9a5b6d5127858b01ec12672c999e7d25cd7aed (diff) | |
| parent | de1d725f442caa4d8ecbac3256b5a33d1f4a1257 (diff) | |
Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/main/glheader.h')
| -rw-r--r-- | src/mesa/main/glheader.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |