diff --git a/ext/phar/config.m4 b/ext/phar/config.m4 index 66b4b318e92ae..8369473097ad1 100644 --- a/ext/phar/config.m4 +++ b/ext/phar/config.m4 @@ -32,8 +32,6 @@ if test "$PHP_PHAR" != "no"; then PHP_ADD_EXTENSION_DEP(phar, spl) PHP_ADD_MAKEFILE_FRAGMENT - PHP_INSTALL_HEADERS([ext/phar], [php_phar.h]) - AC_CONFIG_FILES([ $ext_dir/phar.1 $ext_dir/phar.phar.1 diff --git a/ext/phar/config.w32 b/ext/phar/config.w32 index 3f935eab235f3..c9d04acaf52d7 100644 --- a/ext/phar/config.w32 +++ b/ext/phar/config.w32 @@ -36,7 +36,6 @@ if (PHP_PHAR != "no") { } ADD_EXTENSION_DEP('phar', 'hash'); ADD_EXTENSION_DEP('phar', 'spl'); - PHP_INSTALL_HEADERS("ext/phar", "php_phar.h"); ADD_MAKEFILE_FRAGMENT(); } diff --git a/ext/phar/php_phar.h b/ext/phar/php_phar.h index 66db4c06829c0..18e3485fc3a92 100644 --- a/ext/phar/php_phar.h +++ b/ext/phar/php_phar.h @@ -22,16 +22,7 @@ #define PHP_PHAR_VERSION PHP_VERSION -#include "ext/standard/basic_functions.h" extern zend_module_entry phar_module_entry; #define phpext_phar_ptr &phar_module_entry -#ifdef PHP_WIN32 -#define PHP_PHAR_API __declspec(dllexport) -#else -#define PHP_PHAR_API PHPAPI -#endif - -PHP_PHAR_API zend_result phar_resolve_alias(char *alias, size_t alias_len, char **filename, size_t *filename_len); - #endif /* PHP_PHAR_H */ diff --git a/ext/phar/util.c b/ext/phar/util.c index e49e15aee9cc2..8d42fc26a2222 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -19,7 +19,6 @@ */ #include "phar_internal.h" -#include "php_phar.h" #include "ext/hash/php_hash.h" /* Needed for PHP_HASH_API in ext/hash/php_hash_sha.h */ #include "ext/hash/php_hash_sha.h" #include "ext/standard/md5.h" @@ -975,18 +974,6 @@ phar_entry_info * phar_open_jit(phar_archive_data *phar, phar_entry_info *entry, } /* }}} */ -PHP_PHAR_API zend_result phar_resolve_alias(char *alias, size_t alias_len, char **filename, size_t *filename_len) /* {{{ */ { - phar_archive_data *fd_ptr; - if (HT_IS_INITIALIZED(&PHAR_G(phar_alias_map)) - && NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), alias, alias_len))) { - *filename = fd_ptr->fname; - *filename_len = fd_ptr->fname_len; - return SUCCESS; - } - return FAILURE; -} -/* }}} */ - zend_result phar_free_alias(phar_archive_data *phar, char *alias, size_t alias_len) /* {{{ */ { if (phar->refcount || phar->is_persistent) {