From: Anatol Belski <ab@php.net>
Date: Sun, 5 Apr 2015 18:59:26 +0000 (+0200)
Subject: fix compilation with vc14
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~177^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a1bf93ad9b538342b03866ec9afd7a77f347afd;p=php

fix compilation with vc14
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 01a87fe919..6fef45bb63 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -197,7 +197,10 @@ PHPAPI struct lconv *localeconv_r(struct lconv *out)
 	tsrm_mutex_lock( locale_mutex );
 # endif
 
-#if defined(PHP_WIN32) && defined(ZTS)
+/*  cur->locinfo is struct __crt_locale_info which implementation is
+	hidden in vc14. TODO revisit this and check if a workaround available
+	and needed. */
+#if defined(PHP_WIN32) && _MSC_VER < 1900 && defined(ZTS)
 	{
 		/* Even with the enabled per thread locale, localeconv
 			won't check any locale change in the master thread. */