--- hatari/src/debug/debugInfo.c	2019/04/09 08:55:34	1.1.1.7
+++ hatari/src/debug/debugInfo.c	2019/04/09 08:56:47	1.1.1.8
@@ -331,7 +331,7 @@ static void DebugInfo_PrintOSHeader(FILE
 	langbits = osconf >> 1;
 	if (langbits == 127) {
 		lang = "all";
-	} else if (langbits < ARRAYSIZE(langs)) {
+	} else if (langbits < ARRAY_SIZE(langs)) {
 		lang = langs[langbits];
 	} else {
 		lang = "unknown";
@@ -695,7 +695,7 @@ static char *DebugInfo_Match(const char
 		i = 0;
 	}
 	/* next match */
-	while (i++ < ARRAYSIZE(infotable)) {
+	while (i++ < ARRAY_SIZE(infotable)) {
 		if (!lock && infotable[i-1].lock) {
 			continue;
 		}
@@ -729,7 +729,7 @@ int DebugInfo_Command(int nArgc, char *p
 	if (nArgc > 1) {
 		cmd = psArgs[1];		
 		/* which subcommand? */
-		for (i = 0; i < ARRAYSIZE(infotable); i++) {
+		for (i = 0; i < ARRAY_SIZE(infotable); i++) {
 			if (strcmp(cmd, infotable[i].name) == 0) {
 				sub = i;
 				break;
@@ -756,7 +756,7 @@ int DebugInfo_Command(int nArgc, char *p
 	if (sub < 0 || !ok) {
 		/* no subcommand or something wrong with value, show info */
 		fprintf(stderr, "%s subcommands are:\n", psArgs[0]);
-		for (i = 0; i < ARRAYSIZE(infotable); i++) {
+		for (i = 0; i < ARRAY_SIZE(infotable); i++) {
 			if (!lock && infotable[i].lock) {
 				continue;
 			}