mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-05 20:11:17 +00:00
threads: Cleanup TLS declarations
This time for good.
This commit is contained in:
parent
9d77d83a81
commit
340fc0d40a
@ -31,12 +31,20 @@
|
|||||||
* http://predef.sourceforge.net/precomp.html
|
* http://predef.sourceforge.net/precomp.html
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifdef GIT_THREADS
|
||||||
# define GIT_HAS_TLS 1
|
# define GIT_HAS_TLS 1
|
||||||
|
|
||||||
#if defined(__APPLE__) && defined(__MACH__)
|
/* No TLS in Cygwin */
|
||||||
|
# if defined(__CHECKER__) || defined(__CYGWIN__)
|
||||||
|
# undef GIT_HAS_TLS
|
||||||
|
# define GIT_TLS
|
||||||
|
|
||||||
|
/* No TLS in Mach binaries for Mac OS X */
|
||||||
|
# elif defined(__APPLE__) && defined(__MACH__)
|
||||||
# undef GIT_TLS
|
# undef GIT_TLS
|
||||||
# define GIT_TLS
|
# define GIT_TLS
|
||||||
|
|
||||||
|
/* Normal TLS for GCC */
|
||||||
# elif defined(__GNUC__) || \
|
# elif defined(__GNUC__) || \
|
||||||
defined(__SUNPRO_C) || \
|
defined(__SUNPRO_C) || \
|
||||||
defined(__SUNPRO_CC) || \
|
defined(__SUNPRO_CC) || \
|
||||||
@ -44,6 +52,7 @@
|
|||||||
defined(__xlC__)
|
defined(__xlC__)
|
||||||
# define GIT_TLS __thread
|
# define GIT_TLS __thread
|
||||||
|
|
||||||
|
/* ICC may run on Windows or Linux */
|
||||||
# elif defined(__INTEL_COMPILER)
|
# elif defined(__INTEL_COMPILER)
|
||||||
# if defined(_WIN32) || defined(_WIN32_CE)
|
# if defined(_WIN32) || defined(_WIN32_CE)
|
||||||
# define GIT_TLS __declspec(thread)
|
# define GIT_TLS __declspec(thread)
|
||||||
@ -51,21 +60,19 @@
|
|||||||
# define GIT_TLS __thread
|
# define GIT_TLS __thread
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
/* Declspec for MSVC in Win32 */
|
||||||
# elif defined(_WIN32) || \
|
# elif defined(_WIN32) || \
|
||||||
defined(_WIN32_CE) || \
|
defined(_WIN32_CE) || \
|
||||||
defined(__BORLANDC__)
|
defined(__BORLANDC__)
|
||||||
# define GIT_TLS __declspec(thread)
|
# define GIT_TLS __declspec(thread)
|
||||||
|
|
||||||
|
/* Other platform; no TLS */
|
||||||
# else
|
# else
|
||||||
# undef GIT_HAS_TLS
|
# undef GIT_HAS_TLS
|
||||||
# define GIT_TLS /* nothing: tls vars are thread-global */
|
# define GIT_TLS /* nothing: tls vars are thread-global */
|
||||||
# endif
|
# endif
|
||||||
|
#else /* Disable TLS if libgit2 is not threadsafe */
|
||||||
/* sparse and cygwin don't grok thread-local variables */
|
|
||||||
#if defined(__CHECKER__) || defined(__CYGWIN__)
|
|
||||||
# undef GIT_HAS_TLS
|
|
||||||
# undef GIT_TLS
|
|
||||||
# define GIT_TLS
|
# define GIT_TLS
|
||||||
#endif
|
#endif /* GIT_THREADS */
|
||||||
|
|
||||||
#endif /* INCLUDE_git_thread_utils_h__ */
|
#endif /* INCLUDE_git_thread_utils_h__ */
|
||||||
|
Loading…
Reference in New Issue
Block a user