cellog          Mon Jan 14 03:16:08 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/zip    config.w32 
    /php-src/ext/zip/lib        zip.h 
  Log:
  MFH: fix windows build for all cases, and always export symbols (Steph Fox)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.w32?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u
Index: php-src/ext/zip/config.w32
diff -u php-src/ext/zip/config.w32:1.1.2.1.2.1 
php-src/ext/zip/config.w32:1.1.2.1.2.2
--- php-src/ext/zip/config.w32:1.1.2.1.2.1      Sat Jan 12 03:48:38 2008
+++ php-src/ext/zip/config.w32  Mon Jan 14 03:16:08 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1.2.1.2.1 2008/01/12 03:48:38 cellog Exp $
+// $Id: config.w32,v 1.1.2.1.2.2 2008/01/14 03:16:08 cellog Exp $
 // vim:ft=javascript
 
 ARG_ENABLE("zip", "ZIP support", "no");
@@ -31,9 +31,7 @@
 
                AC_DEFINE('HAVE_ZLIB', 1);
                AC_DEFINE('HAVE_ZIP', 1);
-               if (PHP_ZIP_SHARED) {
-                       ADD_FLAG("CFLAGS_ZIP", "/D PHP_ZIP_EXPORTS ");
-               }
+               ADD_FLAG("CFLAGS_ZIP", "/D PHP_ZIP_EXPORTS ");
        } else {
                WARNING("zip not enabled; libraries and headers not found");
        }
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip.h?r1=1.1.2.3.2.4&r2=1.1.2.3.2.5&diff_format=u
Index: php-src/ext/zip/lib/zip.h
diff -u php-src/ext/zip/lib/zip.h:1.1.2.3.2.4 
php-src/ext/zip/lib/zip.h:1.1.2.3.2.5
--- php-src/ext/zip/lib/zip.h:1.1.2.3.2.4       Sun Jan 13 23:37:41 2008
+++ php-src/ext/zip/lib/zip.h   Mon Jan 14 03:16:08 2008
@@ -44,8 +44,6 @@
 #include "zip_win32.h"
 # ifdef PHP_ZIP_EXPORTS
 #  define PHPZIPAPI __declspec(dllexport)
-# elif defined(COMPILE_DL_ZIP)
-#  define PHPZIPAPI __declspec(dllimport)
 # else
 #  define PHPZIPAPI
 # endif

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

Reply via email to