From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 24 Sep 2014 16:31:22 +0000 (+0400)
Subject: Fixed C++ incompatibility
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~142^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a09bdff6a9ec30f744fa12aeb2875a764fc34c5;p=php

Fixed C++ incompatibility
---

diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index adb30f603f..39a7e1f541 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -285,7 +285,6 @@ ZEND_API int zend_atoi(const char *str, int str_len);
 ZEND_API zend_long zend_atol(const char *str, int str_len);
 
 ZEND_API void zend_locale_sprintf_double(zval *op ZEND_FILE_LINE_DC);
-END_EXTERN_C()
 
 #define convert_to_ex_master(pzv, lower_type, upper_type)	\
 	if (Z_TYPE_P(pzv)!=upper_type) {					\
@@ -928,6 +927,8 @@ static zend_always_inline char *zend_print_long_to_buf(char *buf, zend_long num)
 
 ZEND_API zend_string *zend_long_to_str(zend_long num);
 
+END_EXTERN_C()
+
 #endif
 
 /*