[Mesa-dev] [PATCH 2/7] mapi: fix preprocessor check in u_current_destroy()

Matt Turner mattst88 at gmail.com
Wed Mar 4 20:18:14 PST 2015


On Wed, Mar 4, 2015 at 6:19 PM, Brian Paul <brianp at vmware.com> wrote:
> So it matches the preprocessor check around the u_current_init_tsd() code.
> ---
>  src/mapi/u_current.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/mapi/u_current.c b/src/mapi/u_current.c
> index afa887e..eb77cc7 100644
> --- a/src/mapi/u_current.c
> +++ b/src/mapi/u_current.c
> @@ -125,7 +125,7 @@ static int ThreadSafe;
>  void
>  u_current_destroy(void)
>  {
> -#if defined(THREADS) && defined(_WIN32)
> +#if defined(THREADS) && !defined(GLX_USE_TLS)
>     u_tsd_destroy(&u_current_table_tsd);
>     u_tsd_destroy(&u_current_context_tsd);
>  #endif
> --
> 1.9.1

It looks like this dates from

commit a73c6540d9a7f6e26d8568ba2fc522cb865f0a6c
Author: Chia-I Wu <olv at lunarg.com>
Date:   Fri Apr 23 16:06:26 2010 +0800

    mapi: Add mapi and share the code with glapi.

(see _glapi_destroy_multithread)

and in that same commit it has

+void
+u_tsd_destroy(struct u_tsd *tsd); /* WIN32 only */

So at some point this changed, but it's not clear to me when.

Patches 1-2 are

Reviewed-by: Matt Turner <mattst88 at gmail.com>


More information about the mesa-dev mailing list