diff options
author | jsorg71 <jsorg71> | 2007-11-03 07:18:48 +0000 |
---|---|---|
committer | jsorg71 <jsorg71> | 2007-11-03 07:18:48 +0000 |
commit | 311b688ad73d8b9a834192daafdc8fedc40e0a04 (patch) | |
tree | 96c6cf91d1c82fe09cddf0e5cc784983a93156d1 | |
parent | ea7553f77c5b85e438d16c386c15511d2c40e1b3 (diff) | |
download | xrdp-proprietary-311b688ad73d8b9a834192daafdc8fedc40e0a04.tar.gz xrdp-proprietary-311b688ad73d8b9a834192daafdc8fedc40e0a04.zip |
long to tbus
-rw-r--r-- | common/thread_calls.c | 30 | ||||
-rw-r--r-- | common/thread_calls.h | 18 |
2 files changed, 24 insertions, 24 deletions
diff --git a/common/thread_calls.c b/common/thread_calls.c index d068b26d..5112fbf7 100644 --- a/common/thread_calls.c +++ b/common/thread_calls.c @@ -64,34 +64,34 @@ tc_thread_create(void* (* start_routine)(void*), void* arg) #endif /*****************************************************************************/ -long APP_CC +tbus APP_CC tc_get_threadid(void) { #if defined(_WIN32) - return (long)GetCurrentThreadId(); + return (tbus)GetCurrentThreadId(); #else - return (long)pthread_self(); + return (tbus)pthread_self(); #endif } /*****************************************************************************/ -long APP_CC +tbus APP_CC tc_mutex_create(void) { #if defined(_WIN32) - return (long)CreateMutex(0, 0, 0); + return (tbus)CreateMutex(0, 0, 0); #else pthread_mutex_t* lmutex; lmutex = (pthread_mutex_t*)g_malloc(sizeof(pthread_mutex_t), 0); pthread_mutex_init(lmutex, 0); - return (long)lmutex; + return (tbus)lmutex; #endif } /*****************************************************************************/ void APP_CC -tc_mutex_delete(long mutex) +tc_mutex_delete(tbus mutex) { #if defined(_WIN32) CloseHandle((HANDLE)mutex); @@ -106,7 +106,7 @@ tc_mutex_delete(long mutex) /*****************************************************************************/ int APP_CC -tc_mutex_lock(long mutex) +tc_mutex_lock(tbus mutex) { #if defined(_WIN32) WaitForSingleObject((HANDLE)mutex, INFINITE); @@ -119,7 +119,7 @@ tc_mutex_lock(long mutex) /*****************************************************************************/ int APP_CC -tc_mutex_unlock(long mutex) +tc_mutex_unlock(tbus mutex) { #if defined(_WIN32) ReleaseMutex((HANDLE)mutex); @@ -131,26 +131,26 @@ tc_mutex_unlock(long mutex) } /*****************************************************************************/ -long APP_CC +tbus APP_CC tc_sem_create(int init_count) { #if defined(_WIN32) HANDLE sem; sem = CreateSemaphore(0, init_count, init_count + 10, 0); - return (long)sem; + return (tbus)sem; #else sem_t* sem; sem = g_malloc(sizeof(sem_t), 0); sem_init(sem, 0, init_count); - return (long)sem; + return (tbus)sem; #endif } /*****************************************************************************/ void APP_CC -tc_sem_delete(long sem) +tc_sem_delete(tbus sem) { #if defined(_WIN32) CloseHandle((HANDLE)sem); @@ -165,7 +165,7 @@ tc_sem_delete(long sem) /*****************************************************************************/ int APP_CC -tc_sem_dec(long sem) +tc_sem_dec(tbus sem) { #if defined(_WIN32) WaitForSingleObject((HANDLE)sem, INFINITE); @@ -178,7 +178,7 @@ tc_sem_dec(long sem) /*****************************************************************************/ int APP_CC -tc_sem_inc(long sem) +tc_sem_inc(tbus sem) { #if defined(_WIN32) ReleaseSemaphore((HANDLE)sem, 1, 0); diff --git a/common/thread_calls.h b/common/thread_calls.h index 06583632..e5d32ecb 100644 --- a/common/thread_calls.h +++ b/common/thread_calls.h @@ -30,23 +30,23 @@ int APP_CC tc_thread_create(THREAD_RV (THREAD_CC * start_routine)(void*), void* arg); -long APP_CC +tbus APP_CC tc_get_threadid(void); -long APP_CC +tbus APP_CC tc_mutex_create(void); void APP_CC -tc_mutex_delete(long mutex); +tc_mutex_delete(tbus mutex); int APP_CC -tc_mutex_lock(long mutex); +tc_mutex_lock(tbus mutex); int APP_CC -tc_mutex_unlock(long mutex); -long APP_CC +tc_mutex_unlock(tbus mutex); +tbus APP_CC tc_sem_create(int init_count); void APP_CC -tc_sem_delete(long sem); +tc_sem_delete(tbus sem); int APP_CC -tc_sem_dec(long sem); +tc_sem_dec(tbus sem); int APP_CC -tc_sem_inc(long sem); +tc_sem_inc(tbus sem); #endif |