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

Timestamp:

04/07/13 03:27:55 (11 years ago)

Author:

cheese

Message:

#1 fix thread interface

File:

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

trunk/src/cf_thread.c

@@ -15 +15 @@
 # define THREAD_TYPE    HANDLE
 # define MUTEX_TYPE     HANDLE
+# define THREAD_RETURN  unsigned long   /**< 스레드 워커 함수 반환 형 */
+# define THREAD_CALL    __stdcall
 #else // #if defined(_WIN32) || defined(_WIN64)
 # include <pthread.h>
 # define THREAD_TYPE    pthread_t
 # define MUTEX_TYPE     pthread_mutex_t
+# define THREAD_RETURN  void *          /**< 스레드 워커 함수 반환 형 */
+# define THREAD_CALL
 #endif // #if defined(_WIN32) || defined(_WIN64)
 
@@ -57 +61 @@
     int result = 0;
 
-#if defined(_WIN32) || defined(_WIN64)
-    *threadID = (THREAD_TYPE) _beginthreadex (0, 0, callback, arg, 0, 0);
+    THREAD_RETURN THREAD_CALL f = (THREAD_RETURN THREAD_CALL) callback;
+
+#if defined(_WIN32) || defined(_WIN64)
+
+    *threadID = (THREAD_TYPE) CreateThread (NULL, 0, f, arg, 0, NULL);
     if (*threadID == NULL)
         return CF_ERROR_THREAD_CREATE;
@@ -66 +73 @@
         return CF_ERROR_THREAD_CREATE;
 
-    result = pthread_create ((THREAD_TYPE *) *threadID, NULL, callback, arg);
+    result = pthread_create ((THREAD_TYPE *) *threadID, NULL, f, arg);
     if (result < 0)
         return CF_ERROR_THREAD_CREATE;