diff options
| author | jsorg71 <jsorg71> | 2005-12-14 01:18:06 +0000 |
|---|---|---|
| committer | jsorg71 <jsorg71> | 2005-12-14 01:18:06 +0000 |
| commit | e91c34f803c74ee3372ed4ca18e9dea71db73aeb (patch) | |
| tree | 4ca7fa688c598c1221cf3038f3c1a10ce1fec1bd /common | |
| parent | 4e93fc3c373c0fa85efee998fa2f6aa4fde822cd (diff) | |
| download | xrdp-proprietary-e91c34f803c74ee3372ed4ca18e9dea71db73aeb.tar.gz xrdp-proprietary-e91c34f803c74ee3372ed4ca18e9dea71db73aeb.zip | |
get_threadid should return long
Diffstat (limited to 'common')
| -rw-r--r-- | common/thread_calls.c | 9 | ||||
| -rw-r--r-- | common/thread_calls.h | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/common/thread_calls.c b/common/thread_calls.c index ad2334d4..84407669 100644 --- a/common/thread_calls.c +++ b/common/thread_calls.c @@ -25,10 +25,11 @@ #else #include <pthread.h> #endif +#include "arch.h" /*****************************************************************************/ #if defined(_WIN32) -int +int APP_CC g_thread_create(unsigned long (__stdcall * start_routine)(void*), void* arg) { DWORD thread; @@ -36,7 +37,7 @@ g_thread_create(unsigned long (__stdcall * start_routine)(void*), void* arg) return !CreateThread(0, 0, start_routine, arg, 0, &thread); } #else -int +int APP_CC g_thread_create(void* (* start_routine)(void*), void* arg) { pthread_t thread; @@ -49,12 +50,12 @@ g_thread_create(void* (* start_routine)(void*), void* arg) #endif /*****************************************************************************/ -int +long APP_CC g_get_threadid(void) { #if defined(_WIN32) return 0; #else - return pthread_self(); + return (long)pthread_self(); #endif } diff --git a/common/thread_calls.h b/common/thread_calls.h index 700a8133..af94bafe 100644 --- a/common/thread_calls.h +++ b/common/thread_calls.h @@ -21,9 +21,9 @@ #if !defined(THREAD_CALLS_H) #define THREAD_CALLS_H -int +int APP_CC g_thread_create(THREAD_RV (THREAD_CC * start_routine)(void*), void* arg); -int +long APP_CC g_get_threadid(void); #endif |