From ef695cb7dd17aaa24378c834a5ba5d78e6093792 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Tue, 9 Aug 2011 02:24:59 +0300 Subject: OPENGL: Added a temporary hack to fix compilation under Windows, after the latest changes to the SDL interface layer --- backends/graphics/opengl/gltexture.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'backends/graphics/opengl') diff --git a/backends/graphics/opengl/gltexture.h b/backends/graphics/opengl/gltexture.h index f0cd7aed56..3e04949c8c 100644 --- a/backends/graphics/opengl/gltexture.h +++ b/backends/graphics/opengl/gltexture.h @@ -31,6 +31,16 @@ #undef ARRAYSIZE #endif +// HACK: At this point in Windows platforms, common/util.h has been included +// via common/rect.h (from backends/graphics/sdl/sdl-graphics.h), via +// backends/graphics/openglsdl/openglsdl-graphics.h. Thus, we end up with +// COMMON_UTIL_H defined, and ARRAYSIZE undefined (bad!). Therefore, +// ARRAYSIZE is undefined in openglsdl-graphics.cpp. This is a temporary +// hackish solution fo fix compilation under Windows. +#if !defined(ARRAYSIZE) && defined(COMMON_UTIL_H) +#define ARRAYSIZE(x) ((int)(sizeof(x) / sizeof(x[0]))) +#endif + #if defined(USE_GLES) #include #elif defined(SDL_BACKEND) -- cgit v1.2.3