summaryrefslogtreecommitdiff
path: root/ext/zip/php_zip.h
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2016-01-30 14:56:17 +0100
committerNikita Popov <nikic@php.net>2016-01-30 15:35:28 +0100
commit93dc91b386b53bdd317ea6abd70640e2bbfbaf73 (patch)
treed41b6d2baf80da77c154a4174634d6728e86bb31 /ext/zip/php_zip.h
parent2eb4728611ac9ff6aa77fece737470beabe1db62 (diff)
downloadphp-git-93dc91b386b53bdd317ea6abd70640e2bbfbaf73.tar.gz
Remove version checks
PHP_VERSION_ID PHP_API_VERSION ZEND_MODULE_API_NO PHP_MAJOR_VERSION, PHP_MINOR_VERSION ZEND_ENGINE_2 I've left litespeed alone, as it seems to genuinely maintain support for many PHP versions.
Diffstat (limited to 'ext/zip/php_zip.h')
-rw-r--r--ext/zip/php_zip.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h
index 602b1b1c44..98655e70cc 100644
--- a/ext/zip/php_zip.h
+++ b/ext/zip/php_zip.h
@@ -40,22 +40,7 @@ extern zend_module_entry zip_module_entry;
#define PHP_ZIP_VERSION "1.13.0"
-#ifndef Z_SET_REFCOUNT_P
-# if PHP_MAJOR_VERSION < 6 && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 3)
-# define Z_SET_REFCOUNT_P(pz, rc) pz->refcount = rc
-# define Z_UNSET_ISREF_P(pz) pz->is_ref = 0
-# endif
-#endif
-
-/* {{{ ZIP_OPENBASEDIR_CHECKPATH(filename) */
-#if PHP_API_VERSION < 20100412
-# define ZIP_OPENBASEDIR_CHECKPATH(filename) \
- (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename)
-#else
-#define ZIP_OPENBASEDIR_CHECKPATH(filename) \
- php_check_open_basedir(filename)
-#endif
-/* }}} */
+#define ZIP_OPENBASEDIR_CHECKPATH(filename) php_check_open_basedir(filename)
typedef struct _ze_zip_rsrc {
struct zip *za;