Changeset 50 in libcf for trunk/src/cf_thread.c

Timestamp:

04/01/13 13:23:01 (11 years ago)

Author:

cheese

Message:

#1 fix preprocessor definition for windows

File:

• trunk/src/cf_thread.c (modified) (7 diffs)

trunk/src/cf_thread.c

@@ -10 +10 @@
 #include <stdlib.h>
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
 # include <windows.h>
 # include <process.h>
 # define THREAD_TYPE    HANDLE
 # define MUTEX_TYPE     HANDLE
-#else // #ifdef _WIN32
+#else // #if defined(_WIN32) || defined(_WIN64)
 # include <pthread.h>
 # define THREAD_TYPE    pthread_t
 # define MUTEX_TYPE     pthread_mutex_t
-#endif // #ifdef _WIN32
+#endif // #if defined(_WIN32) || defined(_WIN64)
 
 #define CHECK_INVALID_THREAD(__h)       \
@@ -32 +32 @@
 CF_Thread_Local_Close (void * ctx)
 {
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
     CloseHandle (ctx);
 #else
@@ -57 +57 @@
     int result = 0;
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
     *threadID = (THREAD_TYPE) _beginthreadex (0, 0, callback, arg, 0, 0);
     if (*threadID == NULL)
@@ -105 +105 @@
     CHECK_INVALID_THREAD (*threadID);
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
     WaitForSingleObject ((THREAD_TYPE) *threadID, INFINITE);
 #else
@@ -129 +129 @@
     int result = 0;
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
     *mutex = (MUTEX_TYPE) CreateMutexA (NULL, FALSE, NULL);
     if (*mutex == NULL)
@@ -175 +175 @@
     CHECK_INVALID_MUTEX (*mutex);
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
     WaitForSingleObject ((MUTEX_TYPE) *mutex, INFINITE);
 #else
@@ -196 +196 @@
     CHECK_INVALID_MUTEX (*mutex);
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
     ReleaseMutex (*mutex);
 #else