From c72d6da461d0b6be0cc4d457a64f36f556d09fca Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 14 Jul 2019 13:50:05 +0200 Subject: [PATCH] Remove timelib outdated defines - 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 | 2 -- ext/date/config0.m4 | 1 - ext/date/lib/timelib_config.h.win32 | 1 - win32/build/config.w32.h.in | 1 - 4 files changed, 5 deletions(-) delete mode 100644 ext/date/lib/timelib_config.h.win32 diff --git a/ext/date/config.w32 b/ext/date/config.w32 index 41a776fa56..abf12dc732 100644 --- a/ext/date/config.w32 +++ b/ext/date/config.w32 @@ -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 "); -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"); diff --git a/ext/date/config0.m4 b/ext/date/config0.m4 index 38389503e1..20e4164aaa 100644 --- a/ext/date/config0.m4 +++ b/ext/date/config0.m4 @@ -24,7 +24,6 @@ cat > $ext_builddir/lib/timelib_config.h < #endif #include -#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 index 379b3902fc..0000000000 --- a/ext/date/lib/timelib_config.h.win32 +++ /dev/null @@ -1 +0,0 @@ -# include "config.w32.h" diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index 7a12baec1b..4b4920c509 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -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 -- 2.40.0