diff options
Diffstat (limited to 'ext/zip/php_zip.h')
| -rw-r--r-- | ext/zip/php_zip.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index ffe4530415..f4ad99f293 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -40,10 +40,6 @@ extern zend_module_entry zip_module_entry; #define PHP_ZIP_VERSION "1.12.4" -#if ((PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION >= 6) -# define PHP_ZIP_USE_OO 1 -#endif - #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 @@ -74,27 +70,30 @@ typedef struct _ze_zip_read_rsrc { struct zip_stat sb; } zip_read_rsrc; -#ifdef PHP_ZIP_USE_OO #define ZIPARCHIVE_ME(name, arg_info, flags) {#name, c_ziparchive_ ##name, arg_info,(zend_uint) (sizeof(arg_info)/sizeof(struct _zend_arg_info)-1), flags }, #define ZIPARCHIVE_METHOD(name) ZEND_NAMED_FUNCTION(c_ziparchive_ ##name) - /* Extends zend object */ typedef struct _ze_zip_object { - zend_object zo; struct zip *za; int buffers_cnt; char **buffers; HashTable *prop_handler; char *filename; int filename_len; + zend_object zo; } ze_zip_object; +static inline ze_zip_object *php_zip_fetch_object(zend_object *obj) { + return (ze_zip_object *)((char*)(obj) - XtOffsetOf(ze_zip_object, zo)); +} + +#define Z_ZIP_P(zv) php_zip_fetch_object(Z_OBJ_P((zv))) + php_stream *php_stream_zip_opener(php_stream_wrapper *wrapper, const char *path, const char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC); php_stream *php_stream_zip_open(const char *filename, const char *path, const char *mode STREAMS_DC TSRMLS_DC); extern php_stream_wrapper php_stream_zip_wrapper; -#endif #endif /* PHP_ZIP_H */ |