diff options
| author | Alan Hourihane <alanh@vmware.com> | 2009-01-14 23:33:41 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@vmware.com> | 2009-01-14 23:33:41 +0000 |
| commit | 658b1bdb1cc5f9910be910dc156a2e81ed999756 (patch) | |
| tree | 98d15bcf83b662dd8c7186dd423e3d8ebbd87f1c /src/mesa/glapi | |
| parent | e82784559e00cb534993c01309ad1832e9b3e56b (diff) | |
| parent | 03188b09e071ace9d9e21ccc56c01e90c0fa8639 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
docs/install.html
docs/relnotes-7.3.html
src/mesa/shader/slang/slang_codegen.c
src/mesa/shader/slang/slang_compile.c
src/mesa/shader/slang/slang_emit.c
src/mesa/shader/slang/slang_preprocess.c
src/mesa/shader/slang/slang_preprocess.h
Diffstat (limited to 'src/mesa/glapi')
| -rw-r--r-- | src/mesa/glapi/glthread.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/glapi/glthread.h b/src/mesa/glapi/glthread.h index ad2a63584b..ae2f79f37d 100644 --- a/src/mesa/glapi/glthread.h +++ b/src/mesa/glapi/glthread.h @@ -338,6 +338,10 @@ _glthread_GetTSD(_glthread_TSD *); extern void _glthread_SetTSD(_glthread_TSD *, void *); +#if !defined __GNUC__ || __GNUC__ < 3 +# define __builtin_expect(x, y) x +#endif + #if defined(GLX_USE_TLS) extern __thread struct _glapi_table * _glapi_tls_Dispatch |