From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 5 Sep 2014 10:18:39 +0000 (+0400)
Subject: Fixed support for C++
X-Git-Tag: PRE_PHP7_REMOVALS~115
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a420f0361243e0aa42f93fd996c8f2f133c20cc;p=php

Fixed support for C++
---

diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index 3b487d3138..d6d3415dd5 100644
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -220,8 +220,6 @@ ZEND_API int is_zend_mm(TSRMLS_D);
 ZEND_API size_t zend_memory_usage(int real_usage TSRMLS_DC);
 ZEND_API size_t zend_memory_peak_usage(int real_usage TSRMLS_DC);
 
-END_EXTERN_C()
-
 /* fast cache for HashTables */
 #define ALLOC_HASHTABLE(ht)	\
 	(ht) = (HashTable *) emalloc(sizeof(HashTable))
@@ -262,6 +260,8 @@ ZEND_API void zend_mm_set_custom_handlers(zend_mm_heap *heap,
                                           void  (*_free)(void*),
                                           void* (*_realloc)(void*, size_t));
 
+END_EXTERN_C()
+
 #endif
 
 /*