cvs: php-src(PHP_5_2) /ext/openssl xp_ssl.c /ext/pdo_sqlite/sqlite/src date.c

rrichards Wed Dec 6 13:18:37 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/openssl xp_ssl.c /php-src/ext/pdo_sqlite/sqlite/src date.c Log: Fix win32 build http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.22.2.3.2.3&r2=1.22.2.3.2.4&diff_format=u Index: php-src/ext/openssl/xp_ssl.c diff -u php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.3 php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.4 --- php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.3 Tue Dec 5 01:39:07 2006 +++ php-src/ext/openssl/xp_ssl.c Wed Dec 6 13:18:36 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xp_ssl.c,v 1.22.2.3.2.3 2006/12/05 01:39:07 iliaa Exp $ */ +/* $Id: xp_ssl.c,v 1.22.2.3.2.4 2006/12/06 13:18:36 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.3.2.2.2.2&r2=1.3.2.2.2.3&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.3.2.2.2.2 php-src/ext/pdo_sqlite/sqlite/src/date.c:1.3.2.2.2.3 --- php-src/ext/pdo_sqlite/sqlite/src/date.c:1.3.2.2.2.2 Thu Nov 30 16:38:37 2006 +++ php-src/ext/pdo_sqlite/sqlite/src/date.c Wed Dec 6 13:18:36 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