]> granicus.if.org Git - php/commitdiff
Remove timelib outdated defines
authorPeter Kokot <peterkokot@gmail.com>
Sun, 14 Jul 2019 11:50:05 +0000 (13:50 +0200)
committerPeter Kokot <peterkokot@gmail.com>
Sun, 14 Jul 2019 11:50:05 +0000 (13:50 +0200)
- TIMELIB_OMIT_STDINT is not used anymore since
  https://github.com/derickr/timelib/commit/a171f99cf02baf39549ab7209e37565b8b8f6529
- HAVE_GETTIMEOFDAY was defined multiple times in Windows headers
- ext/date/lib/timelib_config.h.win32 does not seem to be used

Closes GH-4400

ext/date/config.w32
ext/date/config0.m4
ext/date/lib/timelib_config.h.win32 [deleted file]
win32/build/config.w32.h.in

index 41a776fa568c19368bc380f77df08c7cb55a0b82..abf12dc7320fdb4bec8cee265d65751ab95788b7 100644 (file)
@@ -8,8 +8,6 @@ ADD_FLAG('CFLAGS_DATE', "/wd4244");
 var tl_config = FSO.CreateTextFile("ext/date/lib/timelib_config.h", true);
 tl_config.WriteLine("#include \"config.w32.h\"");
 tl_config.WriteLine("#include <php_stdint.h>");
-tl_config.WriteLine("#define TIMELIB_OMIT_STDINT 1");
-tl_config.WriteLine("#define HAVE_GETTIMEOFDAY 1");
 tl_config.WriteLine("#include \"zend.h\"");
 tl_config.WriteLine("#define timelib_malloc  emalloc");
 tl_config.WriteLine("#define timelib_realloc erealloc");
index 38389503e1ccddb768a36b1983cabc4c60d84b7d..20e4164aaa6fd98a2750b74c06a3bf486159cab9 100644 (file)
@@ -24,7 +24,6 @@ cat > $ext_builddir/lib/timelib_config.h <<EOF
 # include <php_config.h>
 #endif
 #include <php_stdint.h>
-#define TIMELIB_OMIT_STDINT 1
 
 #include "zend.h"
 
diff --git a/ext/date/lib/timelib_config.h.win32 b/ext/date/lib/timelib_config.h.win32
deleted file mode 100644 (file)
index 379b390..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# include "config.w32.h"
index 7a12baec1b800d1178652b0996ad6730ccf526b5..4b4920c509113c3b4a8a7a5e8f2d53f632fef803 100644 (file)
@@ -69,7 +69,6 @@
 #define HSREGEX 1
 #define HAVE_GCVT 1
 #define HAVE_GETLOGIN 1
-#define HAVE_GETTIMEOFDAY 1
 #define HAVE_MEMMOVE 1
 #define HAVE_PUTENV 1
 #define HAVE_REGCOMP 1