- macros--; ZEND_FAST_* are now gone

diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index e0391321678a1ee6d7245c91dde5a0959e703691..4b5dac1b589d94297bbf34a093749cb3bee661e9 100644 (file)
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -57,6 +57,13 @@ instead of calling readlink directly, to ensure portability.
   
        e. Zend\zend_fast_cache.h 
 It should not have been used anymore since php5, but now this header has
-been removed. 
+been removed. The following macros are not available anymore:
+
+ZEND_FAST_ALLOC(p, type, fc_type)
+ZEND_FAST_FREE(p, fc_type)
+ZEND_FAST_ALLOC_REL(p, type, fc_type)
+ZEND_FAST_FREE_REL(p, fc_type)
+
+Use emalloc, emalloc_rel, efree or efree_rel instead.
 
 

diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index 03e2f9d8df266c50d84fb7e1bc8415345b6ef153..7650de3beaaf9f1f5bca0091c52a4811d95f5b4c 100644 (file)
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -161,45 +161,31 @@ ZEND_API size_t zend_memory_peak_usage(int real_usage TSRMLS_DC);
 
 END_EXTERN_C()
 
-/* Macroses for zend_fast_cache.h compatibility */
-
-#define ZEND_FAST_ALLOC(p, type, fc_type)      \
-       (p) = (type *) emalloc(sizeof(type))
-
-#define ZEND_FAST_FREE(p, fc_type)     \
-       efree(p)
-
-#define ZEND_FAST_ALLOC_REL(p, type, fc_type)  \
-       (p) = (type *) emalloc_rel(sizeof(type))
-
-#define ZEND_FAST_FREE_REL(p, fc_type) \
-       efree_rel(p)
-
 /* fast cache for zval's */
 #define ALLOC_ZVAL(z)  \
-       ZEND_FAST_ALLOC(z, zval, ZVAL_CACHE_LIST)
+       (z) = (zval *) emalloc(sizeof(zval))
 
 #define FREE_ZVAL(z)   \
-       ZEND_FAST_FREE(z, ZVAL_CACHE_LIST)
+       efree_rel(z)
 
 #define ALLOC_ZVAL_REL(z)      \
-       ZEND_FAST_ALLOC_REL(z, zval, ZVAL_CACHE_LIST)
+       (z) = (zval *) emalloc_rel(sizeof(zval))
 
 #define FREE_ZVAL_REL(z)       \
-       ZEND_FAST_FREE_REL(z, ZVAL_CACHE_LIST)
+       efree_rel(z)
 
 /* fast cache for HashTables */
 #define ALLOC_HASHTABLE(ht)    \
-       ZEND_FAST_ALLOC(ht, HashTable, HASHTABLE_CACHE_LIST)
+       (ht) = (HashTable *) emalloc(sizeof(HashTable))
 
 #define FREE_HASHTABLE(ht)     \
-       ZEND_FAST_FREE(ht, HASHTABLE_CACHE_LIST)
+       efree(ht)
 
 #define ALLOC_HASHTABLE_REL(ht)        \
-       ZEND_FAST_ALLOC_REL(ht, HashTable, HASHTABLE_CACHE_LIST)
+       (ht) = (HashTable *) emalloc_rel(sizeof(HashTable))
 
 #define FREE_HASHTABLE_REL(ht) \
-       ZEND_FAST_FREE_REL(ht, HASHTABLE_CACHE_LIST)
+       efree_rel(ht)
 
 /* Heap functions */
 typedef struct _zend_mm_heap zend_mm_heap;