summaryrefslogtreecommitdiff
path: root/Zend/zend_alloc.h
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2003-08-28 14:53:02 +0000
committerSascha Schumann <sas@php.net>2003-08-28 14:53:02 +0000
commit169d43e5fa3744e4c9ddd851e6b0f3c7773b65c4 (patch)
treead6254875ac6b46bd684db246c5003cbe9ecc085 /Zend/zend_alloc.h
parent367880b2c150002144d7a2eac92e36e47ce6dcea (diff)
downloadphp-git-169d43e5fa3744e4c9ddd851e6b0f3c7773b65c4.tar.gz
cleanup & centralize ZEND_GCC_VERSION and ZEND_ATTRIBUTE_MALLOC so that
they can be used by downstream applications
Diffstat (limited to 'Zend/zend_alloc.h')
-rw-r--r--Zend/zend_alloc.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index 15920bb495..57124322f8 100644
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -64,18 +64,12 @@ typedef union _align_test {
#define MAX_CACHED_ENTRIES 256
#define PRE_INIT_CACHE_ENTRIES 32
-#if __GNUC__ -0 >= 2
+#if ZEND_GCC_VERSION >= 2000
# define PLATFORM_ALIGNMENT (__alignof__ (align_test))
#else
# define PLATFORM_ALIGNMENT (sizeof(align_test))
#endif
-#if GCC_VERSION - 0 >= 2096
-# define ZEND_ATTRIBUTE_MALLOC __attribute__ ((malloc))
-#else
-# define ZEND_ATTRIBUTE_MALLOC
-#endif
-
#define MEM_HEADER_PADDING (((PLATFORM_ALIGNMENT-sizeof(zend_mem_header))%PLATFORM_ALIGNMENT+PLATFORM_ALIGNMENT)%PLATFORM_ALIGNMENT)