fmk             Fri Dec  1 20:24:58 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/sqlite/libsqlite/src   date.c 
    /php-src/ext/zip/lib        zip_dirent.c 
  Log:
  Fix win32 build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/libsqlite/src/date.c?r1=1.3.4.1.2.1&r2=1.3.4.1.2.2&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.1 
php-src/ext/sqlite/libsqlite/src/date.c:1.3.4.1.2.2
--- php-src/ext/sqlite/libsqlite/src/date.c:1.3.4.1.2.1 Thu Nov 30 16:38:37 2006
+++ php-src/ext/sqlite/libsqlite/src/date.c     Fri Dec  1 20:24:58 2006
@@ -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.1 2006/11/30 16:38:37 iliaa Exp $
+** $Id: date.c,v 1.3.4.1.2.2 2006/12/01 20:24:58 fmk Exp $
 **
 ** NOTES:
 **
@@ -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
 
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_dirent.c?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/zip/lib/zip_dirent.c
diff -u php-src/ext/zip/lib/zip_dirent.c:1.1.2.1 
php-src/ext/zip/lib/zip_dirent.c:1.1.2.2
--- php-src/ext/zip/lib/zip_dirent.c:1.1.2.1    Thu Nov 30 16:38:37 2006
+++ php-src/ext/zip/lib/zip_dirent.c    Fri Dec  1 20:24:58 2006
@@ -33,6 +33,7 @@
   IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include "main/php_reentrancy.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -45,7 +46,6 @@
 
 #include "zip.h"
 #include "zipint.h"
-#include "main/php_reentrancy.h"
 
 static time_t _zip_d2u_time(int, int);
 static char *_zip_readfpstr(FILE *, unsigned int, int, struct zip_error *);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to