MFH: Fix redef warnings

Kill warning about php_localtime_r not being defined

diff --git a/ext/sqlite/libsqlite/src/date.c b/ext/sqlite/libsqlite/src/date.c
index cd6761b66a535ca8eb68e0b3b0498eea3a8cc5fb..9ea9c5a77b5d738f699170bf3d1ea5b00dc10ed5 100644 (file)
--- a/ext/sqlite/libsqlite/src/date.c
+++ b/ext/sqlite/libsqlite/src/date.c
@@ -53,9 +53,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <time.h>
-#ifndef PHP_WIN32
 #include "main/php_reentrancy.h"
-#endif
 
 #ifndef SQLITE_OMIT_DATETIME_FUNCS
 

diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index c1eed75a6eda68e42590872552ab9e82630dfc2a..ce1429c581f510b588ad06bce82c41232bf0fec8 100644 (file)
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -4,6 +4,8 @@
 */
 
 /* Define the minimum supported version */
+#undef _WIN32_WINNT
+#undef NTDDI_VERSION
 #define _WIN32_WINNT 0x500
 #define NTDDI_VERSION  _WIN32_WIN2K