shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove duplicate definitions"

--- 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 @@

 #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 @@

 #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)