shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #3184 from mstorsjo/winapp-threads

Fix the build for Windows Phone and Windows Store

--- a/codec/common/inc/WelsThreadLib.h

+++ b/codec/common/inc/WelsThreadLib.h

@@ -60,6 +60,19 @@

 #define    WELS_THREAD_ROUTINE_TYPE         DWORD  WINAPI

 #define    WELS_THREAD_ROUTINE_RETURN(rc)   return (DWORD)rc;

+#ifdef WINAPI_FAMILY

+#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

+#define WP80

+

+#define InitializeCriticalSection(x) InitializeCriticalSectionEx(x, 0, 0)

+#define GetSystemInfo(x) GetNativeSystemInfo(x)

+#define CreateEvent(attr, reset, init, name) CreateEventEx(attr, name, ((reset) ? CREATE_EVENT_MANUAL_RESET : 0) | ((init) ? CREATE_EVENT_INITIAL_SET : 0), EVENT_ALL_ACCESS)

+#define CreateSemaphore(a, b, c, d) CreateSemaphoreEx(a, b, c, d, 0, SEMAPHORE_ALL_ACCESS)

+#define WaitForSingleObject(a, b) WaitForSingleObjectEx(a, b, FALSE)

+#define WaitForMultipleObjects(a, b, c, d) WaitForMultipleObjectsEx(a, b, c, d, FALSE)

+#endif

+#endif

+

 #else // NON-WINDOWS

 #include <stdlib.h>

--- a/codec/common/src/WelsThreadLib.cpp

+++ b/codec/common/src/WelsThreadLib.cpp

@@ -71,18 +71,6 @@

 #if defined(_WIN32) || defined(__CYGWIN__)

-#ifdef WINAPI_FAMILY

-#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

-#define WP80

-

-#define InitializeCriticalSection(x) InitializeCriticalSectionEx(x, 0, 0)

-#define GetSystemInfo(x) GetNativeSystemInfo(x)

-#define CreateEvent(attr, reset, init, name) CreateEventEx(attr, name, ((reset) ? CREATE_EVENT_MANUAL_RESET : 0) | ((init) ? CREATE_EVENT_INITIAL_SET : 0), EVENT_ALL_ACCESS)

-#define WaitForSingleObject(a, b) WaitForSingleObjectEx(a, b, FALSE)

-#define WaitForMultipleObjects(a, b, c, d) WaitForMultipleObjectsEx(a, b, c, d, FALSE)

-#endif

-#endif

-

 WELS_THREAD_ERROR_CODE    WelsMutexInit (WELS_MUTEX*    mutex) {

   InitializeCriticalSection (mutex);