com php-src: Fixed support for C++: Zend/zend_alloc.h

From: Date: Fri, 05 Sep 2014 10:18:39 +0000
Subject: com php-src: Fixed support for C++: Zend/zend_alloc.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81438@lists.php.net to get a copy of this message
Commit: 9a420f0361243e0aa42f93fd996c8f2f133c20cc Author: Dmitry Stogov <dmitry@zend.com> Fri, 5 Sep 2014 14:18:39 +0400 Parents: 08ca9e6d118553e938af9906d07987e8913b6a5d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9a420f0361243e0aa42f93fd996c8f2f133c20cc Log: Fixed support for C++ Changed paths: M Zend/zend_alloc.h Diff: diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h index 3b487d3..d6d3415 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 /*

« previous php.cvs (#81438) next »