From 47fd168fede896f2e2f6752d7ffef67232b331f4 Mon Sep 17 00:00:00 2001
From: Bob Weinand <bobwei9@hotmail.com>
Date: Tue, 28 Oct 2014 23:07:36 +0100
Subject: [PATCH] Move missing zend_hash_* macros from phpdbg.h to zend_hash.h

---
 Zend/zend_hash.h     | 18 ++++++++++++++++++
 sapi/phpdbg/phpdbg.h | 18 ------------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
index 2b9beca0fcc..0ed47b424d5 100644
--- a/Zend/zend_hash.h
+++ b/Zend/zend_hash.h
@@ -539,6 +539,19 @@ static zend_always_inline void *zend_hash_index_update_ptr(HashTable *ht, zend_u
 	return zv ? Z_PTR_P(zv) : NULL;
 }
 
+static zend_always_inline void *zend_hash_index_add_mem(HashTable *ht, zend_ulong h, void *pData, size_t size)
+{
+	zval tmp, *zv;
+
+	ZVAL_PTR(&tmp, NULL);
+	if ((zv = zend_hash_index_add(ht, h, &tmp))) {
+		Z_PTR_P(zv) = pemalloc(size, ht->u.flags & HASH_FLAG_PERSISTENT);
+		memcpy(Z_PTR_P(zv), pData, size);
+		return Z_PTR_P(zv);
+	}
+	return NULL;
+}
+
 static zend_always_inline void *zend_hash_next_index_insert_ptr(HashTable *ht, void *pData)
 {
 	zval tmp, *zv;
@@ -696,6 +709,11 @@ static zend_always_inline void *zend_hash_get_current_data_ptr_ex(HashTable *ht,
 	_key = _p->key; \
 	_val = _z;
 
+#define ZEND_HASH_FOREACH_NUM_KEY_PTR(ht, _h, _ptr) \
+	ZEND_HASH_FOREACH(ht, 0); \
+	_h = _p->h; \
+	_ptr = Z_PTR_P(_z);
+
 #define ZEND_HASH_FOREACH_STR_KEY_PTR(ht, _key, _ptr) \
 	ZEND_HASH_FOREACH(ht, 0); \
 	_key = _p->key; \
diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h
index 188431c99af..60d1239a277 100644
--- a/sapi/phpdbg/phpdbg.h
+++ b/sapi/phpdbg/phpdbg.h
@@ -70,29 +70,11 @@
 # include "TSRM.h"
 #endif
 
-#define ZEND_HASH_FOREACH_NUM_KEY_PTR(ht, _h, _ptr) \
-	ZEND_HASH_FOREACH(ht, 0); \
-	_h = _p->h; \
-	_ptr = Z_PTR_P(_z);
-
 #undef zend_hash_str_add
 #define zend_hash_str_add_tmp(ht, key, len, pData) \
 	_zend_hash_str_add(ht, key, len, pData ZEND_FILE_LINE_CC)
 #define zend_hash_str_add(...) zend_hash_str_add_tmp(__VA_ARGS__)
 
-static zend_always_inline void *zend_hash_index_add_mem(HashTable *ht, zend_ulong h, void *pData, size_t size)
-{
-	zval tmp, *zv;
-
-	ZVAL_PTR(&tmp, NULL);
-	if ((zv = zend_hash_index_add(ht, h, &tmp))) {
-		Z_PTR_P(zv) = pemalloc(size, ht->u.flags & HASH_FLAG_PERSISTENT);
-		memcpy(Z_PTR_P(zv), pData, size);
-		return Z_PTR_P(zv);
-	}
-	return NULL;
-}
-
 #ifdef HAVE_LIBREADLINE
 #	include <readline/readline.h>
 #	include <readline/history.h>