com php-src: Merge branch 'PHP-7.0' into PHP-7.1: Zend/zend_e xceptions.c Zend/zend_string.c Zend/zend_string.h sapi/phpdbg/phpdbg_prompt.c
| From: | Anatol Belski | Date: | Thu, 13 Oct 2016 08:08:10 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: Zend/zend_e xceptions.c Zend/zend_string.c Zend/zend_string.h sapi/phpdbg/phpdbg_prompt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95011@lists.php.net to get a copy of this message | ||
Commit: afbb3b858aae68925b095668841e7a3971714c0f
Author: Anatol Belski <ab@php.net> Thu, 13 Oct 2016 10:08:10 +0200
Parents: ff75665663045a96d6f182e24283e6bebb8537fa ce3e792c2c4c251fd5963a36af5ad4a9dd875085
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=afbb3b858aae68925b095668841e7a3971714c0f
Log:
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
use already exported symbol
Revert "export symbol missing by phpdbg"
Changed paths:
MM Zend/zend_exceptions.c
MM Zend/zend_string.c
MM Zend/zend_string.h
MM sapi/phpdbg/phpdbg_prompt.c
Diff:
diff --cc Zend/zend_string.h
index 1bc3c86,722fc3a..8a1ac6f
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@@ -32,10 -32,7 +32,8 @@@ ZEND_API extern void (*zend_interned_st
ZEND_API zend_ulong zend_hash_func(const char *str, size_t len);
void zend_interned_strings_init(void);
void zend_interned_strings_dtor(void);
+void zend_known_interned_strings_init(zend_string ***, uint32_t *);
- ZEND_API zend_string *zend_strpprintf(size_t max_len, const char *format, ...);
-
END_EXTERN_C()
/* Shortcuts */