diff --git a/src/mapi/glapi/glapi.h b/src/mapi/glapi/glapi.h
index da3d4524931..d6a0ebfcf8a 100644
--- a/src/mapi/glapi/glapi.h
+++ b/src/mapi/glapi/glapi.h
@@ -78,7 +78,7 @@ struct _glapi_table;
 
 #if defined (USE_ELF_TLS)
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 extern __declspec(thread) struct _glapi_table * _glapi_tls_Dispatch;
 extern __declspec(thread) void * _glapi_tls_Context;
 #else
diff --git a/src/mapi/u_current.c b/src/mapi/u_current.c
index 0a749ec87d2..6904167f7d0 100644
--- a/src/mapi/u_current.c
+++ b/src/mapi/u_current.c
@@ -99,7 +99,7 @@ extern void (*__glapi_noop_table[])(void);
 /*@{*/
 #if defined(USE_ELF_TLS)
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 __declspec(thread) struct _glapi_table *u_current_table
     = (struct _glapi_table *) table_noop_array;
 __declspec(thread) void *u_current_context;