cellog Sat Jan 12 03:42:42 2008 UTC
Modified files:
/php-src/ext/zipconfig.w32
/php-src/ext/zip/libzip.h zip_add.c zip_add_dir.c zip_close.c
zip_delete.c zip_dirent.c zip_entry_free.c
zip_entry_new.c zip_error.c zip_error_clear.c
zip_error_get.c zip_error_get_sys_type.c
zip_error_strerror.c zip_error_to_str.c
zip_fclose.c zip_file_error_clear.c
zip_file_error_get.c zip_file_get_offset.c
zip_file_strerror.c zip_fopen.c
zip_fopen_index.c zip_fread.c zip_free.c
zip_get_archive_comment.c
zip_get_file_comment.c zip_get_name.c
zip_get_num_files.c zip_memdup.c
zip_name_locate.c zip_new.c zip_open.c
zip_rename.c zip_replace.c
zip_set_archive_comment.c
zip_set_file_comment.c zip_set_name.c
zip_source_buffer.c zip_source_file.c
zip_source_filep.c zip_source_free.c
zip_source_function.c zip_source_zip.c
zip_stat.c zip_stat_index.c zip_stat_init.c
zip_strerror.c zip_unchange.c
zip_unchange_all.c zip_unchange_archive.c
zip_unchange_data.c zip_win32.h zipint.h
Log:
export symbols for use by other extensions like phar
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.w32?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/zip/config.w32
diff -u php-src/ext/zip/config.w32:1.2 php-src/ext/zip/config.w32:1.3
--- php-src/ext/zip/config.w32:1.2 Wed Nov 1 00:53:32 2006
+++ php-src/ext/zip/config.w32 Sat Jan 12 03:42:41 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2 2006/11/01 00:53:32 pajoye Exp $
+// $Id: config.w32,v 1.3 2008/01/12 03:42:41 cellog Exp $
// vim:ft=javascript
ARG_ENABLE(zip, ZIP support, no);
@@ -31,6 +31,9 @@
AC_DEFINE('HAVE_ZLIB', 1);
AC_DEFINE('HAVE_ZIP', 1);
+ if (PHP_ZIP_SHARED) {
+ 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.5r2=1.6diff_format=u
Index: php-src/ext/zip/lib/zip.h
diff -u php-src/ext/zip/lib/zip.h:1.5 php-src/ext/zip/lib/zip.h:1.6
--- php-src/ext/zip/lib/zip.h:1.5 Mon Dec 31 07:12:17 2007
+++ php-src/ext/zip/lib/zip.h Sat Jan 12 03:42:41 2008
@@ -37,16 +37,22 @@
*/
-
-#ifdef __cplusplus
-extern C {
+#include main/php.h
+#ifdef PHP_WIN32
+#include zip_win32.h
+# ifdef PHP_ZIP_EXPORTS
+# define PHPZIPAPI __declspec(dllexport)
+# elif defined(COMPILE_DL_ZIP)
+# define PHPZIPAPI __declspec(dllimport)
+# endif
+#else
+#define PHPZIPAPI
#endif
-
+BEGIN_EXTERN_C()
#include sys/types.h
#include stdio.h
#include time.h
-#include zip_win32.h
/* flags for zip_open */
@@ -162,49 +168,46 @@
-int zip_add(struct zip *, const char *, struct zip_source *);
-int zip_add_dir(struct zip *, const char *);
-int zip_close(struct zip *);
-int zip_delete(struct zip *, int);
-void zip_error_clear(struct zip *);
-void zip_error_get(struct zip *, int *, int *);
-int zip_error_get_sys_type(int);
-int zip_error_to_str(char *, size_t, int, int);
-int zip_fclose(struct zip_file *);
-void zip_file_error_clear(struct zip_file *);
-void zip_file_error_get(struct zip_file *, int *, int *);
-const char *zip_file_strerror(struct zip_file *);
-struct zip_file *zip_fopen(struct zip *, const char *, int);
-struct zip_file *zip_fopen_index(struct zip *, int, int);
-ssize_t zip_fread(struct zip_file *, void *, size_t);
-const char *zip_get_archive_comment(struct zip *, int *, int);
-const char *zip_get_file_comment(struct zip *, int, int *, int);
-const char *zip_get_name(struct zip *, int, int);
-int zip_get_num_files(struct zip *);
-int zip_name_locate(struct zip *, const char *, int);
-struct zip *zip_open(const char *, int, int *);
-int zip_rename(struct zip *, int, const char *);
-int zip_replace(struct zip *, int, struct zip_source *);
-int zip_set_archive_comment(struct zip *, const char *, int);
-int zip_set_file_comment(struct zip *, int, const char *, int);
-struct zip_source *zip_source_buffer(struct zip *, const void *, off_t, int);
-struct zip_source *zip_source_file(struct zip *, const char *, off_t, off_t);
-struct zip_source *zip_source_filep(struct zip *, FILE *, off_t, off_t);
-void zip_source_free(struct zip_source *);
-struct zip_source
