Changeset 1760 for trunk

Timestamp:

16/11/11 10:33:07 (6 months ago)

Author:

Freddie Akeroyd

Message:

Add MSVC TLS definition. Refs #303

File:

• trunk/src/napi.c (modified) (4 diffs)

trunk/src/napi.c

@@ -53 +53 @@
 #define LIBSEP ";"
 #define PATHSEP "\\"
+#define THREAD_LOCAL __declspec(thread)
 #else
 #define LIBSEP ":"
 #define PATHSEP "/"
+#define THREAD_LOCAL __thread
 #endif
 
@@ -66 +68 @@
  */
 #include <windows.h>
+
 
 static CRITICAL_SECTION nx_critical;
@@ -292 +295 @@
   static void (*NXEHIReportError)(void *pData, char *string) = NXNXNXReportError;
 #ifdef HAVE_TLS
-  static __thread void *NXEHpTData = NULL;
-  static __thread void (*NXEHIReportTError)(void *pData, char *string) = NULL;
+  static THREAD_LOCAL void *NXEHpTData = NULL;
+  static THREAD_LOCAL void (*NXEHIReportTError)(void *pData, char *string) = NULL;
 #endif
 
@@ -347 +350 @@
 static ErrFunc last_global_errfunc = NXNXNXReportError;
 #ifdef HAVE_TLS
-static __thread ErrFunc last_thread_errfunc = NULL;
+static THREAD_LOCAL ErrFunc last_thread_errfunc = NULL;
 #endif