diff options
author | marha <marha@users.sourceforge.net> | 2012-10-04 10:53:47 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-10-04 10:53:47 +0200 |
commit | 0130346adbce7e6b2422429887fc46c76806d845 (patch) | |
tree | 1b88028d42d79ab8062581d361a720b04a87fbc0 /mesalib/src/mapi/glapi/glapi_entrypoint.c | |
parent | 7ed9dbafdbc724c1030404f29678559134de559b (diff) | |
download | vcxsrv-0130346adbce7e6b2422429887fc46c76806d845.tar.gz vcxsrv-0130346adbce7e6b2422429887fc46c76806d845.tar.bz2 vcxsrv-0130346adbce7e6b2422429887fc46c76806d845.zip |
randrproto mesa pixman git update 4 oct 2012
randrproto: 4fcbd8584e55ff789522a38a41a33c34446d1455
mesa: 185d6df3c10a7ff5defe163af614bfc41088910b
pixman: 2e17b6dd4ee7c32684fb7ffc70d3ad3ebf7cb2ef
Diffstat (limited to 'mesalib/src/mapi/glapi/glapi_entrypoint.c')
-rw-r--r-- | mesalib/src/mapi/glapi/glapi_entrypoint.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mapi/glapi/glapi_entrypoint.c b/mesalib/src/mapi/glapi/glapi_entrypoint.c index 993ccb94c..7a0eb3537 100644 --- a/mesalib/src/mapi/glapi/glapi_entrypoint.c +++ b/mesalib/src/mapi/glapi/glapi_entrypoint.c @@ -136,7 +136,7 @@ extern void __glapi_sparc_icache_flush(unsigned int *); static void init_glapi_relocs( void ) { -#if defined(PTHREADS) || defined(GLX_USE_TLS) +#if defined(HAVE_PTHREAD) || defined(GLX_USE_TLS) static const unsigned int template[] = { #ifdef GLX_USE_TLS 0x05000000, /* sethi %hi(_glapi_tls_Dispatch), %g2 */ @@ -266,7 +266,7 @@ init_glapi_relocs( void ) _glapi_proc generate_entrypoint(GLuint functionOffset) { -#if defined(PTHREADS) || defined(GLX_USE_TLS) +#if defined(HAVE_PTHREAD) || defined(GLX_USE_TLS) static const unsigned int template[] = { 0x07000000, /* sethi %hi(0), %g3 */ 0x8210000f, /* mov %o7, %g1 */ @@ -337,7 +337,7 @@ fill_in_entrypoint_offset(_glapi_proc entrypoint, GLuint offset) void init_glapi_relocs_once( void ) { -#if defined(PTHREADS) || defined(GLX_USE_TLS) +#if defined(HAVE_PTHREAD) || defined(GLX_USE_TLS) static pthread_once_t once_control = PTHREAD_ONCE_INIT; pthread_once( & once_control, init_glapi_relocs ); #endif |