summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalle Sommer Nielsen <kalle@php.net>2009-04-06 09:14:54 +0000
committerKalle Sommer Nielsen <kalle@php.net>2009-04-06 09:14:54 +0000
commit49e4959a6d419b4f73f8015af07c5d9c80f0acab (patch)
tree02b6852a70174fa098b0ef833d0e452e0c390bba
parentd038c5f0dbd145a8821a4354453e5e1186ee75f4 (diff)
downloadphp-git-49e4959a6d419b4f73f8015af07c5d9c80f0acab.tar.gz
MFH: Fix redef warnings
Kill warning about php_localtime_r not being defined
-rw-r--r--ext/sqlite/libsqlite/src/date.c2
-rw-r--r--win32/build/config.w32.h.in2
2 files changed, 2 insertions, 2 deletions
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