diff options
| author | Nikita Popov <nikic@php.net> | 2012-08-13 16:51:41 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-08-13 16:54:53 +0200 |
| commit | f4ce3646285fbdd3354ca86ae67857b6ee8f7e3a (patch) | |
| tree | ad8597fe53119f9eb1daac0df4e554d3c7861c21 /Zend/zend_string.h | |
| parent | 268740d9848d435054ce73a8cfe36b2b732cd1f7 (diff) | |
| parent | 80d5ae3cea4c6fdd85789edfde0e2da721a0741b (diff) | |
| download | php-git-f4ce3646285fbdd3354ca86ae67857b6ee8f7e3a.tar.gz | |
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
This is just an intial merge. It does not yet make generators and finally
work together.
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Zend/zend_vm_execute.skl
Zend/zend_vm_opcodes.h
Diffstat (limited to 'Zend/zend_string.h')
| -rw-r--r-- | Zend/zend_string.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_string.h b/Zend/zend_string.h index a61d2fb30d..0a4738466d 100644 --- a/Zend/zend_string.h +++ b/Zend/zend_string.h @@ -23,12 +23,14 @@ #include "zend.h" +BEGIN_EXTERN_C() ZEND_API extern const char *(*zend_new_interned_string)(const char *str, int len, int free_src TSRMLS_DC); ZEND_API extern void (*zend_interned_strings_snapshot)(TSRMLS_D); ZEND_API extern void (*zend_interned_strings_restore)(TSRMLS_D); void zend_interned_strings_init(TSRMLS_D); void zend_interned_strings_dtor(TSRMLS_D); +END_EXTERN_C() #ifndef ZTS |