From 8f420443d798ddf53cdcd253829807c09f498490 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Fri, 18 May 2018 00:17:05 +0200 Subject: [PATCH] winecfg: Remove an ARRAY_SIZE()-like macro. Signed-off-by: Michael Stefaniuc Signed-off-by: Alexandre Julliard --- programs/winecfg/appdefaults.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index a08542a2c91..61d515c7077 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -72,8 +72,6 @@ static const struct #endif }; -#define NB_VERSIONS (sizeof(win_versions)/sizeof(win_versions[0])) - static const char szKey9x[] = "Software\\Microsoft\\Windows\\CurrentVersion"; static const char szKeyNT[] = "Software\\Microsoft\\Windows NT\\CurrentVersion"; static const char szKeyProdNT[] = "System\\CurrentControlSet\\Control\\ProductOptions"; @@ -113,7 +111,7 @@ static int get_registry_version(void) } major = atoi(ver); - for (i = 0; i < NB_VERSIONS; i++) + for (i = 0; i < ARRAY_SIZE(win_versions); i++) { if (win_versions[i].dwPlatformId != platform) continue; if (win_versions[i].dwMajorVersion != major) continue; @@ -151,7 +149,7 @@ static void update_comboboxes(HWND dialog) WINE_TRACE("winver is %s\n", winver); /* normalize the version strings */ - for (i = 0; i < NB_VERSIONS; i++) + for (i = 0; i < ARRAY_SIZE(win_versions); i++) { if (!strcasecmp (win_versions[i].szVersion, winver)) { @@ -181,7 +179,7 @@ init_comboboxes (HWND dialog) SendDlgItemMessageW (dialog, IDC_WINVER, CB_ADDSTRING, 0, (LPARAM)str); } - for (i = 0; i < NB_VERSIONS; i++) + for (i = 0; i < ARRAY_SIZE(win_versions); i++) { SendDlgItemMessageA(dialog, IDC_WINVER, CB_ADDSTRING, 0, (LPARAM) win_versions[i].szDescription);