com php-src: fix timezone usage in soap for vc14: ext/soap/php _encoding.c
| From: | Anatol Belski | Date: | Sun, 10 May 2015 20:22:01 +0000 |
| Subject: | com php-src: fix timezone usage in soap for vc14: ext/soap/php _encoding.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86666@lists.php.net to get a copy of this message | ||
Commit: f22a5bd710ca62175275e0cd5d5143c010e94bf1
Author: Anatol Belski <ab@php.net> Sun, 10 May 2015 21:16:56 +0200
Parents: 359df4dea8aa87f7b0c86471c312f60697e71b75
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f22a5bd710ca62175275e0cd5d5143c010e94bf1
Log:
fix timezone usage in soap for vc14
Changed paths:
M ext/soap/php_encoding.c
Diff:
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index 9c25067..96207f7 100644
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -2905,7 +2905,7 @@ static xmlNodePtr to_xml_datetime_ex(encodeTypePtr type, zval *data, char
*forma
#ifdef HAVE_TM_GMTOFF
snprintf(tzbuf, sizeof(tzbuf), "%c%02d:%02d", (ta->tm_gmtoff < 0) ? '-'
: '+', abs(ta->tm_gmtoff / 3600), abs( (ta->tm_gmtoff % 3600) / 60 ));
#else
-# if defined(__CYGWIN__) || defined(NETWARE)
+# if defined(__CYGWIN__) || defined(NETWARE) || (defined(PHP_WIN32) && defined(_MSC_VER)
&& _MSC_VER >= 1900)
snprintf(tzbuf, sizeof(tzbuf), "%c%02d:%02d", ((ta->tm_isdst ? _timezone -
3600:_timezone)>0)?'-':'+', abs((ta->tm_isdst ? _timezone - 3600 :
_timezone) / 3600), abs(((ta->tm_isdst ? _timezone - 3600 : _timezone) % 3600) / 60));
# else
snprintf(tzbuf, sizeof(tzbuf), "%c%02d:%02d", ((ta->tm_isdst ? timezone -
3600:timezone)>0)?'-':'+', abs((ta->tm_isdst ? timezone - 3600 : timezone)
/ 3600), abs(((ta->tm_isdst ? timezone - 3600 : timezone) % 3600) / 60));