summaryrefslogtreecommitdiff
path: root/ext/zip/php_zip.h
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2008-08-08 15:52:53 +0000
committerPierre Joye <pajoye@php.net>2008-08-08 15:52:53 +0000
commitf4087a70aa671ed98d5f7c1859d18c25bd4f4ea4 (patch)
treee890659dd07958e6d9da791c04bb645c7a82224f /ext/zip/php_zip.h
parentb9d7e8b0484b6f643a59fe09ca77821925ccecce (diff)
downloadphp-git-f4087a70aa671ed98d5f7c1859d18c25bd4f4ea4.tar.gz
- MFH: use PHP_ZIP_VERSION_STRING and add add_ascii_assoc_string macro (easy sync)
Diffstat (limited to 'ext/zip/php_zip.h')
-rw-r--r--ext/zip/php_zip.h4
1 files changed, 3 insertions, 1 deletions
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