com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/date/config.w32 ext/date/php_date.c ext/date/tests/DateTimeZone_getLoca tion.phpt
ext/intl/common/common_date.cpp ext/intl/ti mezone/timezone_class.cpp

From: Date: Wed, 16 Aug 2017 14:20:45 +0000
Subject: com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/date/config.w32 ext/date/php_date.c ext/date/tests/DateTimeZone_getLoca tion.phpt
ext/intl/common/common_date.cpp ext/intl/ti mezone/timezone_class.cpp
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-99055@lists.php.net to get a copy of this message
Commit: 547f9fd3890083657edc3b4dd4c21a74b75a1d7e Author: Derick Rethans <github@derickrethans.nl> Wed, 16 Aug 2017 15:20:45 +0100 Parents: 9a72a7c58fab41ebeee76fcbbd5027f05a8fbeee 60a6feed0795df986238ec35a928fb032ea96a46 Branches: PHP-7.1 PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=547f9fd3890083657edc3b4dd4c21a74b75a1d7e Log: Merge branch 'PHP-7.0' into PHP-7.1 Changed paths: MM ext/date/config.w32 MM ext/date/php_date.c MM ext/date/tests/DateTimeZone_getLocation.phpt MM ext/intl/common/common_date.cpp MM ext/intl/timezone/timezone_class.cpp Diff: diff --cc ext/date/php_date.c index d378d47,00722d3..e619b4c --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@@ -29,12 -29,7 +29,11 @@@ #include "php_date.h" #include "zend_interfaces.h" #include "lib/timelib.h" - #include "lib/timelib_private.h" +#ifndef PHP_WIN32 #include <time.h> +#else +#include "win32/time.h" +#endif #ifdef PHP_WIN32 static __inline __int64 php_date_llabs( __int64 i ) { return i >= 0? i: -i; }

« previous php.cvs (#99055) next »