threads: Cleanup TLS declarations

This time for good.

threads: Cleanup TLS declarations
This time for good.
340fc0d4 · Vicent Marti · 9d77d83a · 340fc0d4
Commit 340fc0d4 authored Jun 07, 2011 by Vicent Marti
Hide whitespace changes
Inline Side-by-side

Showing with 37 additions and 30 deletions

include/git2/thread-utils.h
+37 -30

No files found.
--- a/include/git2/thread-utils.h
+++ b/include/git2/thread-utils.h
@@ -31,41 +31,48 @@
 *          http://predef.sourceforge.net/precomp.html
 */
-#define GIT_HAS_TLS 1
+#ifdef GIT_THREADS
+#  define GIT_HAS_TLS 1
-#if defined(__APPLE__) && defined(__MACH__)
+/* No TLS in Cygwin */
-# undef GIT_TLS
+#  if defined(__CHECKER__) || defined(__CYGWIN__)
-# define GIT_TLS
+#    undef GIT_HAS_TLS
+#    define GIT_TLS
-#elif defined(__GNUC__) || \
+/* No TLS in Mach binaries for Mac OS X */
-      defined(__SUNPRO_C) || \
+#  elif defined(__APPLE__) && defined(__MACH__)
-      defined(__SUNPRO_CC) || \
+#    undef GIT_TLS
-      defined(__xlc__) || \
+#    define GIT_TLS
-      defined(__xlC__)
-# define GIT_TLS __thread
-#elif defined(__INTEL_COMPILER)
+/* Normal TLS for GCC */
-# if defined(_WIN32) || defined(_WIN32_CE)
+#  elif defined(__GNUC__) || \
-#  define GIT_TLS __declspec(thread)
+        defined(__SUNPRO_C) || \
-# else
+        defined(__SUNPRO_CC) || \
-#  define GIT_TLS __thread
+        defined(__xlc__) || \
-# endif
+        defined(__xlC__)
+#    define GIT_TLS __thread
-#elif defined(_WIN32) || \
+/* ICC may run on Windows or Linux */
-      defined(_WIN32_CE) || \
+#  elif defined(__INTEL_COMPILER)
-      defined(__BORLANDC__)
+#    if defined(_WIN32) || defined(_WIN32_CE)
-# define GIT_TLS __declspec(thread)
+#      define GIT_TLS __declspec(thread)
+#    else
+#      define GIT_TLS __thread
+#    endif
-#else
+/* Declspec for MSVC in Win32 */
-# undef GIT_HAS_TLS
+#  elif defined(_WIN32) || \
-# define GIT_TLS /* nothing: tls vars are thread-global */
+        defined(_WIN32_CE) || \
-#endif
+        defined(__BORLANDC__)
+#    define GIT_TLS __declspec(thread)
-/* sparse and cygwin don't grok thread-local variables */
+/* Other platform; no TLS */
-#if defined(__CHECKER__) || defined(__CYGWIN__)
+#  else
-# undef GIT_HAS_TLS
+#    undef GIT_HAS_TLS
-# undef GIT_TLS
+#    define GIT_TLS /* nothing: tls vars are thread-global */
-# define GIT_TLS
+#  endif
-#endif
+#else /* Disable TLS if libgit2 is not threadsafe */
+#  define GIT_TLS
+#endif /* GIT_THREADS */
 #endif /* INCLUDE_git_thread_utils_h__ */