From: Derick Rethans <github@derickrethans.nl>
Date: Wed, 16 Aug 2017 14:20:45 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0RC1~51^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=547f9fd3890083657edc3b4dd4c21a74b75a1d7e;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

547f9fd3890083657edc3b4dd4c21a74b75a1d7e
diff --cc ext/date/php_date.c
index d378d47be5,00722d3c8e..e619b4c975
--- 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; }