patch 9.0.1390: FOR_ALL_ macros are defined in an unexpected file
Problem: FOR_ALL_ macros are defined in an unexpected file.
Solution: Move FOR_ALL_ macros to macros.h. Add FOR_ALL_HASHTAB_ITEMS.
(Yegappan Lakshmanan, closes #12109)
diff --git a/src/os_win32.c b/src/os_win32.c
index a151b19..b519bf0 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -1308,9 +1308,9 @@
if (mods)
{
// If "modifiers" is explicitly set in the args, then we reset any
- // remembered modifer key state that may have been set from earlier
- // mod-key-down events, even if they are not yet unset by earlier
- // mod-key-up events.
+ // remembered modifier key state that may have been set from
+ // earlier mod-key-down events, even if they are not yet unset by
+ // earlier mod-key-up events.
s_dwMods = 0;
if (mods & MOD_MASK_SHIFT)
ker.dwControlKeyState |= SHIFT_PRESSED;
@@ -2017,7 +2017,7 @@
}
// Ideally, WriteConsoleInput would be used to inject these low-level
- // events. But, this doesnt work well in the CI test environment. So
+ // events. But, this doesn't work well in the CI test environment. So
// implementing an input_record_buffer instead.
if (input_encoded)
lpEventsWritten = write_input_record_buffer(&ir, 1);
@@ -5737,7 +5737,7 @@
if (env != NULL)
{
- for (hi = env->dv_hashtab.ht_array; todo > 0; ++hi)
+ FOR_ALL_HASHTAB_ITEMS(&env->dv_hashtab, hi, todo)
{
if (!HASHITEM_EMPTY(hi))
{