com php-src: cleanup: Zend/zend_alloc.c

From: Date: Wed, 14 Jan 2015 11:32:23 +0000
Subject: com php-src: cleanup: Zend/zend_alloc.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-84087@lists.php.net to get a copy of this message
Commit: d5b5ad72b633b24d8f669d43f8e1c6a78de79b12 Author: Anatol Belski <ab@php.net> Wed, 14 Jan 2015 12:31:57 +0100 Parents: 8e3764e287ceb3c954dfd866dc72c9530907bef7 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d5b5ad72b633b24d8f669d43f8e1c6a78de79b12 Log: cleanup Changed paths: M Zend/zend_alloc.c Diff: diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 6ee5161..17387d8 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2267,8 +2267,7 @@ ZEND_API void* ZEND_FASTCALL _safe_realloc(void *ptr, size_t nmemb, size_t size, ZEND_API void* ZEND_FASTCALL _ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) { void *p; -#ifdef ZEND_SIGNALS -#endif + HANDLE_BLOCK_INTERRUPTIONS(); p = _safe_emalloc(nmemb, size, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); @@ -2285,8 +2284,6 @@ ZEND_API char* ZEND_FASTCALL _estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_ { size_t length; char *p; -#ifdef ZEND_SIGNALS -#endif HANDLE_BLOCK_INTERRUPTIONS(); @@ -2304,8 +2301,6 @@ ZEND_API char* ZEND_FASTCALL _estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_ ZEND_API char* ZEND_FASTCALL _estrndup(const char *s, size_t length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) { char *p; -#ifdef ZEND_SIGNALS -#endif HANDLE_BLOCK_INTERRUPTIONS(); @@ -2324,8 +2319,6 @@ ZEND_API char* ZEND_FASTCALL _estrndup(const char *s, size_t length ZEND_FILE_LI ZEND_API char* ZEND_FASTCALL zend_strndup(const char *s, size_t length) { char *p; -#ifdef ZEND_SIGNALS -#endif HANDLE_BLOCK_INTERRUPTIONS();

« previous php.cvs (#84087) next »