diff options
| author | Veres Lajos <vlajos@gmail.com> | 2013-07-08 22:09:06 +0100 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-21 20:09:53 -0700 |
| commit | 4749457a498828e9f7919401889a991b8a9b94b5 (patch) | |
| tree | e3515ab9366020e2b422a370033c0b4f2b91d11f /ext/com_dotnet | |
| parent | 29281dee491d675185ce155e7956d1617d551c4a (diff) | |
| download | php-git-4749457a498828e9f7919401889a991b8a9b94b5.tar.gz | |
HASH_KEY_NON_EXISTANT fix
Diffstat (limited to 'ext/com_dotnet')
| -rw-r--r-- | ext/com_dotnet/com_variant.c | 2 | ||||
| -rw-r--r-- | ext/com_dotnet/com_wrapper.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c index 556f356b97..e153d35804 100644 --- a/ext/com_dotnet/com_variant.c +++ b/ext/com_dotnet/com_variant.c @@ -53,7 +53,7 @@ static void safe_array_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC) if (HASH_KEY_IS_STRING == keytype) { goto bogus; - } else if (HASH_KEY_NON_EXISTANT == keytype) { + } else if (HASH_KEY_NON_EXISTENT == keytype) { break; } if (intindex > max_index) { diff --git a/ext/com_dotnet/com_wrapper.c b/ext/com_dotnet/com_wrapper.c index 597b059951..355779e4ad 100644 --- a/ext/com_dotnet/com_wrapper.c +++ b/ext/com_dotnet/com_wrapper.c @@ -467,7 +467,7 @@ static void generate_dispids(php_dispatchex *disp TSRMLS_DC) /* properties */ if (Z_OBJPROP_P(disp->object)) { zend_hash_internal_pointer_reset_ex(Z_OBJPROP_P(disp->object), &pos); - while (HASH_KEY_NON_EXISTANT != (keytype = + while (HASH_KEY_NON_EXISTENT != (keytype = zend_hash_get_current_key_ex(Z_OBJPROP_P(disp->object), &name, &namelen, &pid, 0, &pos))) { char namebuf[32]; @@ -498,7 +498,7 @@ static void generate_dispids(php_dispatchex *disp TSRMLS_DC) /* functions */ if (Z_OBJCE_P(disp->object)) { zend_hash_internal_pointer_reset_ex(&Z_OBJCE_P(disp->object)->function_table, &pos); - while (HASH_KEY_NON_EXISTANT != (keytype = + while (HASH_KEY_NON_EXISTENT != (keytype = zend_hash_get_current_key_ex(&Z_OBJCE_P(disp->object)->function_table, &name, &namelen, &pid, 0, &pos))) { @@ -598,7 +598,7 @@ PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *si zend_hash_init(disp->name_to_dispid, 0, NULL, ZVAL_PTR_DTOR, 0); zend_hash_internal_pointer_reset_ex(id_to_name, &pos); - while (HASH_KEY_NON_EXISTANT != (keytype = + while (HASH_KEY_NON_EXISTENT != (keytype = zend_hash_get_current_key_ex(id_to_name, &name, &namelen, &pid, 0, &pos))) { if (keytype == HASH_KEY_IS_LONG) { |