diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-12-21 22:33:23 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-12-21 22:33:23 +0000 |
| commit | 87055d92256821751e9e1d22a3d2bbbcc4f7307e (patch) | |
| tree | 0b994293d1a84709881cc0a14a4759f8e4375ea4 /dist/Mesa/src | |
| parent | e0ac23200fe0739b7571ac66a11b1a64b29bd00d (diff) | |
__builtin_expect is a gcc 3.x feature. define it out for gcc 2.95.
Patch suggested by miod@. Thanks.
Diffstat (limited to 'dist/Mesa/src')
| -rw-r--r-- | dist/Mesa/src/mesa/glapi/glthread.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/dist/Mesa/src/mesa/glapi/glthread.h b/dist/Mesa/src/mesa/glapi/glthread.h index 0958cd1b3..47b7dce27 100644 --- a/dist/Mesa/src/mesa/glapi/glthread.h +++ b/dist/Mesa/src/mesa/glapi/glthread.h @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 + * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * @@ -64,6 +64,12 @@ #define GLTHREAD_H +#if defined(USE_MGL_NAMESPACE) +#define _glapi_Dispatch _mglapi_Dispatch +#endif + + + #if (defined(PTHREADS) || defined(SOLARIS_THREADS) ||\ defined(WIN32_THREADS) || defined(USE_XTHREADS) || defined(BEOS_THREADS)) \ && !defined(THREADS) @@ -292,6 +298,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 |