changed MT enabling macro to ZSTD_MULTITHREAD

This commit is contained in:
Yann Collet
2017-01-19 14:05:07 -08:00
parent f22adae984
commit 0f984d94c4
5 changed files with 16 additions and 16 deletions
+3 -3
View File
@@ -11,7 +11,7 @@
#include <stddef.h> /* size_t */
#include <stdlib.h> /* malloc, calloc, free */
#ifdef ZSTD_PTHREAD
#ifdef ZSTD_MULTITHREAD
#include <threading.h>
@@ -160,7 +160,7 @@ void POOL_add(void *ctxVoid, POOL_function function, void *opaque) {
pthread_cond_signal(&ctx->queuePopCond);
}
#else /* ZSTD_PTHREAD not defined */
#else /* ZSTD_MULTITHREAD not defined */
/* No multi-threading support */
/* We don't need any data, but if it is empty malloc() might return NULL. */
@@ -183,4 +183,4 @@ void POOL_add(void *ctx, POOL_function function, void *opaque) {
function(opaque);
}
#endif /* ZSTD_PTHREAD */
#endif /* ZSTD_MULTITHREAD */
+3 -3
View File
@@ -12,10 +12,10 @@
*/
/**
* This file will hold wrapper for systems, which do not support Pthreads
* This file will hold wrapper for systems, which do not support pthreads
*/
#if defined(ZSTD_PTHREAD) && defined(_WIN32)
#if defined(ZSTD_MULTITHREAD) && defined(_WIN32)
/**
* Windows minimalist Pthread Wrapper, based on :
@@ -70,4 +70,4 @@ int _pthread_join(pthread_t * thread, void **value_ptr)
}
}
#endif
#endif /* ZSTD_MULTITHREAD */
+4 -4
View File
@@ -18,7 +18,7 @@
extern "C" {
#endif
#if defined(ZSTD_PTHREAD) && defined(_WIN32)
#if defined(ZSTD_MULTITHREAD) && defined(_WIN32)
/**
* Windows minimalist Pthread Wrapper, based on :
@@ -73,11 +73,11 @@ int _pthread_join(pthread_t* thread, void** value_ptr);
*/
#elif defined(ZSTD_PTHREAD) /* posix assumed ; need a better detection mathod */
#elif defined(ZSTD_MULTITHREAD) /* posix assumed ; need a better detection mathod */
/* === POSIX Systems === */
# include <pthread.h>
#else /* ZSTD_PTHREAD not defined */
#else /* ZSTD_MULTITHREAD not defined */
/* No multithreading support */
#define pthread_mutex_t int /* #define rather than typedef, as sometimes pthread support is implicit, resulting in duplicated symbols */
@@ -95,7 +95,7 @@ int _pthread_join(pthread_t* thread, void** value_ptr);
/* do not use pthread_t */
#endif /* ZSTD_PTHREAD */
#endif /* ZSTD_MULTITHREAD */
#if defined (__cplusplus)
}