diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
| commit | a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc (patch) | |
| tree | b45a5d42d9d2ab47f9f06180e12ca973d289a3cc /ext/soap/php_encoding.c | |
| parent | 6c0e1ca4fa31a860a363abecd6376d99edff8833 (diff) | |
| parent | 2104bea5d756dfa40b605a4a2765a3bc4637a76c (diff) | |
| download | php-git-a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
Diffstat (limited to 'ext/soap/php_encoding.c')
| -rw-r--r-- | ext/soap/php_encoding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index c6a3f865cb..8119f6f4f7 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -2896,7 +2896,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) || (defined(PHP_WIN32) && defined(_MSC_VER) && _MSC_VER >= 1900) +# if defined(__CYGWIN__) || (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)); |