diff options
| author | Yaowu Xu <yaowu@google.com> | 2016-01-20 18:12:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-20 18:12:51 +0000 |
| commit | 31a94868b5ded407a37a99f0b97e905d45d67bee (patch) | |
| tree | ea85769e40eb9b7c6db3088bbd129c7d7c164cd9 | |
| parent | abf58ecf6a74bcabaad180e53694c5c070c72773 (diff) | |
| parent | cfe9758c4e3f6ac4898af160b3371db8888f9647 (diff) | |
| download | libvpx-31a94868b5ded407a37a99f0b97e905d45d67bee.tar libvpx-31a94868b5ded407a37a99f0b97e905d45d67bee.tar.gz libvpx-31a94868b5ded407a37a99f0b97e905d45d67bee.tar.bz2 libvpx-31a94868b5ded407a37a99f0b97e905d45d67bee.zip | |
Merge "Remove duplicate definitions"
| -rw-r--r-- | vp8/common/threading.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/vp8/common/threading.h b/vp8/common/threading.h index b2e6ded3d..bc99dbb93 100644 --- a/vp8/common/threading.h +++ b/vp8/common/threading.h @@ -12,6 +12,7 @@ #ifndef VP8_COMMON_THREADING_H_ #define VP8_COMMON_THREADING_H_ + #ifdef __cplusplus extern "C" { #endif @@ -28,8 +29,6 @@ extern "C" { #define THREAD_SPECIFIC_INDEX DWORD #define pthread_t HANDLE #define pthread_attr_t DWORD -#define pthread_create(thhandle,attr,thfunc,tharg) (int)((*thhandle=(HANDLE)_beginthreadex(NULL,0,(unsigned int (__stdcall *)(void *))thfunc,tharg,0,NULL))==NULL) -#define pthread_join(thread, result) ((WaitForSingleObject((thread),INFINITE)!=WAIT_OBJECT_0) || !CloseHandle(thread)) #define pthread_detach(thread) if(thread!=NULL)CloseHandle(thread) #define thread_sleep(nms) Sleep(nms) #define pthread_cancel(thread) terminate_thread(thread,0) @@ -49,9 +48,6 @@ extern "C" { #define THREAD_SPECIFIC_INDEX PULONG #define pthread_t TID #define pthread_attr_t ULONG -#define pthread_create(thhandle,attr,thfunc,tharg) \ - ((int)((*(thhandle)=_beginthread(thfunc,NULL,1024*1024,tharg))==-1)) -#define pthread_join(thread, result) ((int)DosWaitThread(&(thread),0)) #define pthread_detach(thread) 0 #define thread_sleep(nms) DosSleep(nms) #define pthread_cancel(thread) DosKillThread(thread) |