From: Kalle Sommer Nielsen <kalle@php.net>
Date: Mon, 6 Apr 2009 09:14:54 +0000 (+0000)
Subject: MFH: Fix redef warnings
X-Git-Tag: php-5.3.0RC2~217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49e4959a6d419b4f73f8015af07c5d9c80f0acab;p=php

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 cd6761b66a..9ea9c5a77b 100644
--- 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 c1eed75a6e..ce1429c581 100644
--- 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