diff options
| author | Nikita Popov <nikic@php.net> | 2014-09-06 13:47:05 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-09-06 14:03:59 +0200 |
| commit | 43b02e169c718335a82b8c90c3252194f988659a (patch) | |
| tree | 077cd2a26e9a1fbf503ea2e9b176152e2b7e7d3b /Zend/zend.h | |
| parent | 208164012c391466862e84d706c9ef08667bec0f (diff) | |
| download | php-git-43b02e169c718335a82b8c90c3252194f988659a.tar.gz | |
Move safe_address into zend_multiply.h
This allows reuse in zend_arena_calloc.
Also renamed the function to zend_safe_address as it's no longer
private to the allocator.
Diffstat (limited to 'Zend/zend.h')
| -rw-r--r-- | Zend/zend.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index a0d8ba9e0c..b542452c50 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -260,10 +260,11 @@ char *alloca (); #define ZTS_V 0 #endif -#include "zend_errors.h" -#include "zend_alloc.h" +#include "../TSRM/TSRM.h" +#include "zend_errors.h" #include "zend_types.h" +#include "zend_alloc.h" #ifdef HAVE_LIMITS_H # include <limits.h> |