AuroraMiddleware/harfbuzz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #81 from KonstantinRitt/fixes/build/win8phone

Browse Source 
winrt_buildfixes
This commit is contained in:
Behdad Esfahbod 2015-01-25 13:06:03 -08:00
commit 70c25ee215
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-mutex-private.hh
View File

@ -47,7 +47,11 @@
#include <windows.h> #include <windows.h>
typedef CRITICAL_SECTION hb_mutex_impl_t; typedef CRITICAL_SECTION hb_mutex_impl_t;
#define HB_MUTEX_IMPL_INIT {0} #define HB_MUTEX_IMPL_INIT {0}
#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
#define hb_mutex_impl_init(M) InitializeCriticalSectionEx (M, 0, 0)
#else
#define hb_mutex_impl_init(M) InitializeCriticalSection (M) #define hb_mutex_impl_init(M) InitializeCriticalSection (M)
#endif
#define hb_mutex_impl_lock(M) EnterCriticalSection (M) #define hb_mutex_impl_lock(M) EnterCriticalSection (M)
#define hb_mutex_impl_unlock(M) LeaveCriticalSection (M) #define hb_mutex_impl_unlock(M) LeaveCriticalSection (M)
#define hb_mutex_impl_finish(M) DeleteCriticalSection (M) #define hb_mutex_impl_finish(M) DeleteCriticalSection (M)

24
src/hb-private.hh
View File

@ -94,12 +94,6 @@
# endif # endif
#endif #endif
#if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER)
#define snprintf _snprintf
/* Windows CE only has _strdup, while rest of Windows has both. */
#define strdup _strdup
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
#undef inline #undef inline
#define inline __inline #define inline __inline
@ -134,14 +128,20 @@
# ifndef STRICT # ifndef STRICT
# define STRICT 1 # define STRICT 1
# endif # endif
#endif
#ifdef _WIN32_WCE # if defined(_WIN32_WCE)
/* Some things not defined on Windows CE. */ /* Some things not defined on Windows CE. */
#define MemoryBarrier() # define getenv(Name) NULL
#define getenv(Name) NULL # define setlocale(Category, Locale) "C"
#define setlocale(Category, Locale) "C"
static int errno = 0; /* Use something better? */ static int errno = 0; /* Use something better? */
# elif defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
# define getenv(Name) NULL
# endif
# if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER)
# define snprintf _snprintf
/* Windows CE only has _strdup, while rest of Windows has both. */
# define strdup _strdup
# endif
#endif #endif
#if HAVE_ATEXIT #if HAVE_ATEXIT