diff options
| author | Pierre Joye <pajoye@php.net> | 2008-08-08 15:52:53 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-08-08 15:52:53 +0000 |
| commit | f4087a70aa671ed98d5f7c1859d18c25bd4f4ea4 (patch) | |
| tree | e890659dd07958e6d9da791c04bb645c7a82224f | |
| parent | b9d7e8b0484b6f643a59fe09ca77821925ccecce (diff) | |
| download | php-git-f4087a70aa671ed98d5f7c1859d18c25bd4f4ea4.tar.gz | |
- MFH: use PHP_ZIP_VERSION_STRING and add add_ascii_assoc_string macro (easy sync)
| -rw-r--r-- | ext/zip/php_zip.c | 24 | ||||
| -rw-r--r-- | ext/zip/php_zip.h | 4 |
2 files changed, 17 insertions, 11 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 1c6f46c067..adf1e5d56c 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -88,9 +88,13 @@ static int le_zip_entry; RETURN_FALSE; \ } \ RETURN_TRUE; - /* }}} */ +#if (PHP_MAJOR_VERSION < 6) +# define add_ascii_assoc_string add_assoc_string +# define add_ascii_assoc_long add_assoc_long +#endif + #ifdef ZEND_ENGINE_2_1 /* {{{ php_zip_extract_file */ /* TODO: Simplify it */ @@ -345,13 +349,13 @@ static int php_zip_parse_options(zval *options, long *remove_all_path, #define RETURN_SB(sb) \ { \ array_init(return_value); \ - add_assoc_string(return_value, "name", (char *)(sb)->name, 1); \ - add_assoc_long(return_value, "index", (long) (sb)->index); \ - add_assoc_long(return_value, "crc", (long) (sb)->crc); \ - add_assoc_long(return_value, "size", (long) (sb)->size); \ - add_assoc_long(return_value, "mtime", (long) (sb)->mtime); \ - add_assoc_long(return_value, "comp_size", (long) (sb)->comp_size); \ - add_assoc_long(return_value, "comp_method", (long) (sb)->comp_method); \ + add_ascii_assoc_string(return_value, "name", (char *)(sb)->name, 1); \ + add_ascii_assoc_long(return_value, "index", (long) (sb)->index); \ + add_ascii_assoc_long(return_value, "crc", (long) (sb)->crc); \ + add_ascii_assoc_long(return_value, "size", (long) (sb)->size); \ + add_ascii_assoc_long(return_value, "mtime", (long) (sb)->mtime); \ + add_ascii_assoc_long(return_value, "comp_size", (long) (sb)->comp_size); \ + add_ascii_assoc_long(return_value, "comp_method", (long) (sb)->comp_method); \ } /* }}} */ @@ -1071,7 +1075,7 @@ zend_module_entry zip_module_entry = { NULL, NULL, PHP_MINFO(zip), - "@PACKAGE_VERSION@", + PHP_ZIP_VERSION_STRING, STANDARD_MODULE_PROPERTIES }; /* }}} */ @@ -2612,7 +2616,7 @@ static PHP_MINFO_FUNCTION(zip) php_info_print_table_row(2, "Zip", "enabled"); php_info_print_table_row(2, "Extension Version","$Id$"); - php_info_print_table_row(2, "Zip version", "@PACKAGE_VERSION@"); + php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION_STRING); php_info_print_table_row(2, "Libzip version", "0.7.1"); php_info_print_table_end(); diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index 850c6a2b6c..dea9b3b086 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -36,6 +36,8 @@ extern zend_module_entry zip_module_entry; #include "lib/zip.h" +#define PHP_ZIP_VERSION_STRING "1.8.11" + #ifndef ZEND_ENGINE_2_1 # if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 0) || PHP_MAJOR_VERSION == 6 # define ZEND_ENGINE_2_1 @@ -53,7 +55,7 @@ extern zend_module_entry zip_module_entry; #if (PHP_MAJOR_VERSION < 6) #define OPENBASEDIR_CHECKPATH(filename) \ (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename TSRMLS_CC) -#else +#else #define OPENBASEDIR_CHECKPATH(filename) \ php_check_open_basedir(filename TSRMLS_CC) #endif |