src/hb-private.hh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
New commits: commit ce01ad7c2f5a259030f4dbec746f85522aa9c3f9 Author: Behdad Esfahbod <[email protected]> Date: Wed Apr 1 11:05:59 2015 -0700 MSVC 2015 supports snprintf and not _snprintf diff --git a/src/hb-private.hh b/src/hb-private.hh index 99d5c58..6505238 100644 --- a/src/hb-private.hh +++ b/src/hb-private.hh @@ -128,7 +128,7 @@ 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) +# if defined(_MSC_VER) && _MSC_VER < 1900 # define snprintf _snprintf # endif #endif commit 560718862f0bd994b62361652d6fd558c4182e2a Author: Behdad Esfahbod <[email protected]> Date: Wed Apr 1 11:04:33 2015 -0700 Move WinCE define to better place diff --git a/src/hb-private.hh b/src/hb-private.hh index 06b24a8..99d5c58 100644 --- a/src/hb-private.hh +++ b/src/hb-private.hh @@ -121,6 +121,7 @@ # if defined(_WIN32_WCE) /* Some things not defined on Windows CE. */ +# define strdup _strdup # define getenv(Name) NULL # define setlocale(Category, Locale) "C" static int errno = 0; /* Use something better? */ @@ -129,8 +130,6 @@ static int errno = 0; /* Use something better? */ # 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 _______________________________________________ HarfBuzz mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/harfbuzz
