--- hatari/src/includes/main.h	2019/04/09 08:55:39	1.1.1.26
+++ hatari/src/includes/main.h	2019/04/09 08:56:52	1.1.1.27
@@ -19,6 +19,10 @@
 #include <SDL_types.h>
 #include <stdbool.h>
 
+#if defined(_MSC_VER)
+#include "vs-fix.h"
+#endif
+
 #if __GNUC__ >= 3
 # define likely(x)      __builtin_expect (!!(x), 1)
 # define unlikely(x)    __builtin_expect (!!(x), 0)
@@ -42,8 +46,8 @@
 
 #define CALL_VAR(func)  { ((void(*)(void))func)(); }
 
-#ifndef ARRAYSIZE
-#define ARRAYSIZE(x) (int)(sizeof(x)/sizeof(x[0]))
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x) (int)(sizeof(x)/sizeof(x[0]))
 #endif
 
 /* 68000 operand sizes */