kalle Mon Apr 6 09:14:54 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite/libsqlite/src date.c
/php-src/win32/build config.w32.h.in
Log:
MFH: Fix redef warnings
Kill warning about php_localtime_r not being defined
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/libsqlite/src/date.c?r1=1.3.4.1.2.3&r2=1.3.4.1.2.3.2.1&diff_format=u
Index: php-src/ext/sqlite/libsqlite/src/date.c
diff -u php-src/ext/sqlite/libsqlite/src/date.c:1.3.4.1.2.3
php-src/ext/sqlite/libsqlite/src/date.c:1.3.4.1.2.3.2.1
--- php-src/ext/sqlite/libsqlite/src/date.c:1.3.4.1.2.3 Thu Jun 7 09:07:36 2007
+++ php-src/ext/sqlite/libsqlite/src/date.c Mon Apr 6 09:14:54 2009
@@ -16,7 +16,7 @@
** sqliteRegisterDateTimeFunctions() found at the bottom of the file.
** All other code has file scope.
**
-** $Id: date.c,v 1.3.4.1.2.3 2007/06/07 09:07:36 tony2001 Exp $
+** $Id: date.c,v 1.3.4.1.2.3.2.1 2009/04/06 09:14:54 kalle Exp $
**
** NOTES:
**
@@ -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
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.7.2.4.2.3.2.11&r2=1.7.2.4.2.3.2.12&diff_format=u
Index: php-src/win32/build/config.w32.h.in
diff -u php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.11
php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.12
--- php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.11 Mon Feb 2
09:40:55 2009
+++ php-src/win32/build/config.w32.h.in Mon Apr 6 09:14:54 2009
@@ -1,9 +1,11 @@
/*
Build Configuration Template for Win32.
- $Id: config.w32.h.in,v 1.7.2.4.2.3.2.11 2009/02/02 09:40:55 pajoye Exp $
+ $Id: config.w32.h.in,v 1.7.2.4.2.3.2.12 2009/04/06 09:14:54 kalle Exp $
*/
/* Define the minimum supported version */
+#undef _WIN32_WINNT
+#undef NTDDI_VERSION
#define _WIN32_WINNT 0x500
#define NTDDI_VERSION _WIN32_WIN2K
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
