com php-src: Fix bug #62651: source level BC break: Zend/zend_string.h
| From: | Gustavo André dos Santos Lopes | Date: | Thu, 26 Jul 2012 21:37:02 +0000 |
| Subject: | com php-src: Fix bug #62651: source level BC break: Zend/zend_string.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69718@lists.php.net to get a copy of this message | ||
Commit: ccffec74d070e862cae8d8752d716eabb53002b3
Author: Gustavo André dos Santos Lopes <cataphract@php.net> Thu, 26 Jul 2012
23:37:02 +0200
Parents: 7d890eef82ab054c04458e676d63d2492cf20362
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ccffec74d070e862cae8d8752d716eabb53002b3
Log:
Fix bug #62651: source level BC break
Break for C++ extensions that don't wrap the includes of PHP libraries
in extern "C" {.
Bugs:
https://bugs.php.net/62651
Changed paths:
M Zend/zend_string.h
Diff:
diff --git a/Zend/zend_string.h b/Zend/zend_string.h
index a61d2fb..0a47384 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