fix macro usage
[m6w6/ext-http] / php_http_negotiate.h
index 598e871cd03407b95f32ee3bea014a5172fa5cdb..586828fae5afacdf31aacff610a48ed4845d82f9 100644 (file)
@@ -77,7 +77,7 @@ static inline HashTable *php_http_negotiate_content_type(HashTable *supported, p
                 \
                zend_hash_internal_pointer_reset((supported)); \
                if ((value = zend_hash_get_current_data((supported)))) { \
-                       RETVAL_ZVAL_FAST(value); \
+                       RETVAL_ZVAL(value, 1, 0); \
                } else { \
                        RETVAL_NULL(); \
                } \
@@ -102,7 +102,7 @@ static inline HashTable *php_http_negotiate_content_type(HashTable *supported, p
                zend_string *key; \
                zend_ulong idx; \
                 \
-               if (zend_hash_num_elements(result) && HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(result, &key, &idx, NULL)) { \
+               if (zend_hash_num_elements(result) && HASH_KEY_IS_STRING == zend_hash_get_current_key(result, &key, &idx)) { \
                        RETVAL_STR_COPY(key); \
                } else { \
                        PHP_HTTP_DO_NEGOTIATE_DEFAULT(supported); \