diff options
| author | Bjoern Breitmeyer <bjoern.breitmeyer@kdab.com> | 2015-03-27 15:42:57 +0100 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-04-11 12:54:00 +0000 |
| commit | 11bd02e4c2f96d904c532e568089596af02e8593 (patch) | |
| tree | 71a0bf961e737ff279bf5cc71bf6464d2a6f2185 /src/3rdparty | |
| parent | 8a2645b8f048092aee3e9cfa570171a1dfc58651 (diff) | |
Fix WEC2013 build of harfbuzz-ng
Errno is available on WEC2013 and the locale setting isn't
necessary either.
Change-Id: I648d03d842c17b04afdd2d89674119ce020769a4
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/src/hb-private.hh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/3rdparty/harfbuzz-ng/src/hb-private.hh b/src/3rdparty/harfbuzz-ng/src/hb-private.hh index 06b24a80f8..06d7f228a7 100644 --- a/src/3rdparty/harfbuzz-ng/src/hb-private.hh +++ b/src/3rdparty/harfbuzz-ng/src/hb-private.hh @@ -121,16 +121,17 @@ # if defined(_WIN32_WCE) /* Some things not defined on Windows CE. */ +# define strdup _strdup # define getenv(Name) NULL -# define setlocale(Category, Locale) "C" +# if _WIN32_WCE < 0x800 +# define setlocale(Category, Locale) "C" static int errno = 0; /* Use something better? */ +# endif # 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) +# if defined(_MSC_VER) && _MSC_VER < 1900 # define snprintf _snprintf - /* Windows CE only has _strdup, while rest of Windows has both. */ -# define strdup _strdup # endif #endif |