diff options
| author | Thies C. Arntzen <thies@php.net> | 2000-03-26 14:46:25 +0000 |
|---|---|---|
| committer | Thies C. Arntzen <thies@php.net> | 2000-03-26 14:46:25 +0000 |
| commit | 7ec4e5e21b8bb52bac18a3682b66f04f771e8aec (patch) | |
| tree | c74c5d6d6167884010c46e95ee38fa901945d636 | |
| parent | 6a048bfd64ea17263e27200be39b0acdf1648eb8 (diff) | |
| download | php-git-7ec4e5e21b8bb52bac18a3682b66f04f771e8aec.tar.gz | |
<alloca.h> needs to be included before we define macros calling alloca()
atleast using SGI's cc - should not harm other platforms (i hope)
| -rw-r--r-- | Zend/zend.h | 12 | ||||
| -rw-r--r-- | Zend/zend_execute.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index bce477c006..c47c256292 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -83,12 +83,16 @@ # define ZEND_EXTENSIONS_SUPPORT 0 #endif +#if defined(HAVE_ALLOCA) && defined(HAVE_ALLOCA_H) +# include <alloca.h> +#endif + #if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) -# define do_alloca(p) alloca(p) -# define free_alloca(p) +# define do_alloca(p) alloca(p) +# define free_alloca(p) #else -# define do_alloca(p) emalloc(p) -# define free_alloca(p) efree(p) +# define do_alloca(p) emalloc(p) +# define free_alloca(p) efree(p) #endif #if ZEND_DEBUG diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 1986e1c43a..5764937db2 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -32,10 +32,6 @@ #include "zend_fast_cache.h" #include "zend_execute_locks.h" -#if defined(HAVE_ALLOCA) && defined(HAVE_ALLOCA_H) -# include <alloca.h> -#endif - #define get_zval_ptr(node, Ts, should_free, type) _get_zval_ptr(node, Ts, should_free ELS_CC) #define get_zval_ptr_ptr(node, Ts, type) _get_zval_ptr_ptr(node, Ts ELS_CC) |