diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2013-10-31 16:23:38 -0700 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2013-10-31 16:23:38 -0700 |
| commit | bb42643ae02c6bb522db169748d29e4be6695b1e (patch) | |
| tree | 25b73836901583f8e42f5a9c6fe235f88efe7d8e /ext/phar/php_phar.h | |
| parent | 6b68f44e6b46dffd7fe029eca7afc37f1fa57347 (diff) | |
| parent | 55ee543e2f73c45c8fa2c51ebef9820a610f70b4 (diff) | |
| download | php-git-bb42643ae02c6bb522db169748d29e4be6695b1e.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src: (107 commits)
Typo fix: umknown -> unknown
add news entry about FPM backlog change
Fix bug #66008
updated libs_versions.txt
Update NEWS
Update NEWS
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
add bundled libzip LICENSE, as required by BSD License terms
- Updated to version 2013.8 (2013h)
Use zval* instead of zval**
Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
Improved performance of array_merge() by eliminating useless copying
Improved performance of func_get_args() by eliminating useless copying
Link to more readmes
increase backlog to the highest value everywhere
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
- Updated to version 2013.7 (2013g)
Increment version number, since this will be 5.5.6.
Added Zend Debugger to the note about the load order (by trash4you at online dot de)
...
Diffstat (limited to 'ext/phar/php_phar.h')
| -rw-r--r-- | ext/phar/php_phar.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/phar/php_phar.h b/ext/phar/php_phar.h index a6d7bff414..f8325d0c63 100644 --- a/ext/phar/php_phar.h +++ b/ext/phar/php_phar.h @@ -22,7 +22,7 @@ #ifndef PHP_PHAR_H #define PHP_PHAR_H -#define PHP_PHAR_VERSION "2.0.1" +#define PHP_PHAR_VERSION "2.0.2" #include "ext/standard/basic_functions.h" extern zend_module_entry phar_module_entry; @@ -31,9 +31,11 @@ extern zend_module_entry phar_module_entry; #ifdef PHP_WIN32 #define PHP_PHAR_API __declspec(dllexport) #else -#define PHP_PHAR_API +#define PHP_PHAR_API PHPAPI #endif +PHP_PHAR_API int phar_resolve_alias(char *alias, int alias_len, char **filename, int *filename_len TSRMLS_DC); + #endif /* PHP_PHAR_H */ |