[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-private.hh |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 125cb08345a7f27e565329d37093b1a60a41a403
Merge: e8fd839 855a5d7
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Apr 10 12:19:57 2015 -0700

    Merge pull request #98 from KonstantinRitt/WEC2013
    
    Fix build on WEC2013

commit 855a5d7cb8f585bf66dd18cb480b8c3feef62480
Author: Konstantin Ritt <ritt.ks at gmail.com>
Date:   Fri Apr 10 17:18:01 2015 +0400

    Fix build on WEC2013
    
    Based on patch from Björn Breitmeyer

diff --git a/src/hb-private.hh b/src/hb-private.hh
index 6505238..06d7f22 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -123,8 +123,10 @@
      /* 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