rrichards Wed Dec 6 13:20:17 2006 UTC
Modified files:
/php-src/ext/openssl xp_ssl.c
/php-src/ext/pdo_sqlite/sqlite/src date.c
Log:
MFB: Fix win32 build
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.28&r2=1.29&diff_format=u
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.28 php-src/ext/openssl/xp_ssl.c:1.29
--- php-src/ext/openssl/xp_ssl.c:1.28 Tue Dec 5 01:39:21 2006
+++ php-src/ext/openssl/xp_ssl.c Wed Dec 6 13:20:17 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xp_ssl.c,v 1.28 2006/12/05 01:39:21 iliaa Exp $ */
+/* $Id: xp_ssl.c,v 1.29 2006/12/06 13:20:17 rrichards Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -27,6 +27,10 @@
#include <openssl/x509.h>
#include <openssl/err.h>
+#ifdef PHP_WIN32
+#include "win32/time.h"
+#endif
+
#ifdef NETWARE
#include <sys/select.h>
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite/src/date.c?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite/src/date.c
diff -u php-src/ext/pdo_sqlite/sqlite/src/date.c:1.7
php-src/ext/pdo_sqlite/sqlite/src/date.c:1.8
--- php-src/ext/pdo_sqlite/sqlite/src/date.c:1.7 Thu Nov 30 16:38:53 2006
+++ php-src/ext/pdo_sqlite/sqlite/src/date.c Wed Dec 6 13:20:17 2006
@@ -53,7 +53,9 @@
#include <stdlib.h>
#include <assert.h>
#include <time.h>
+#ifndef PHP_WIN32
#include "main/php_reentrancy.h"
+#endif
#ifndef SQLITE_OMIT_DATETIME_FUNCS
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
