diff options
| -rw-r--r-- | src/common.h | 6 | ||||
| -rw-r--r-- | src/errors.h | 1 | ||||
| -rw-r--r-- | src/git/thread-utils.h | 11 | ||||
| -rw-r--r-- | src/odb.c | 2 |
4 files changed, 14 insertions, 6 deletions
diff --git a/src/common.h b/src/common.h index 3ba86b2be..89b6f61f7 100644 --- a/src/common.h +++ b/src/common.h @@ -1,8 +1,7 @@ #ifndef INCLUDE_common_h__ #define INCLUDE_common_h__ -#include "cc-compat.h" -#include "errors.h" +#include "git/thread-utils.h" #ifdef GIT_HAS_PTHREAD # include <pthread.h> @@ -18,8 +17,9 @@ # define PRIuPTR "lu" #endif +#include "cc-compat.h" #include "util.h" -#include "git/common.h" +#include "errors.h" #define GIT_PATH_MAX 4096 diff --git a/src/errors.h b/src/errors.h index ab415d59c..94093ddb4 100644 --- a/src/errors.h +++ b/src/errors.h @@ -2,7 +2,6 @@ #define INCLUDE_errors_h__ #include "git/errors.h" -#include <stdlib.h> /* convenience functions */ GIT_INLINE(int) git_int_error(int code) diff --git a/src/git/thread-utils.h b/src/git/thread-utils.h index 8baf75bed..241514f3a 100644 --- a/src/git/thread-utils.h +++ b/src/git/thread-utils.h @@ -8,10 +8,10 @@ */ #define GIT_HAS_TLS 1 +#define GIT_HAS_PTHREAD 1 #if defined(__APPLE__) && defined(__MACH__) # undef GIT_TLS -# define GIT_HAS_PTHREAD #elif defined(__GNUC__) || \ defined(__SUNPRO_C) || \ @@ -23,6 +23,7 @@ #elif defined(__INTEL_COMPILER) # if defined(_WIN32) || defined(_WIN32_CE) # define GIT_TLS __declspec(thread) +# undef GIT_HAS_PTHREAD # else # define GIT_TLS __thread # endif @@ -31,9 +32,11 @@ defined(_WIN32_CE) || \ defined(__BORLANDC__) # define GIT_TLS __declspec(thread) +# undef GIT_HAS_PTHREAD #else # undef GIT_HAS_TLS +# undef GIT_HAS_PTHREAD # define GIT_TLS /* nothing: tls vars are thread-global */ #endif @@ -44,4 +47,10 @@ # define GIT_TLS #endif +#ifdef GIT_HAS_PTHREAD +# define GIT_THREADS 1 +#else +# undef GIT_THREADS +#endif + #endif /* INCLUDE_git_thread_utils_h__ */ @@ -23,9 +23,9 @@ * Boston, MA 02110-1301, USA. */ +#include "common.h" #include "git/odb.h" #include "git/zlib.h" -#include "common.h" #include "fileops.h" #include "hash.h" #include <stdio.h> |