From 462f18c7b25fe3e467f837647d07ab0a78aa8d2b Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 22 Feb 2015 21:39:56 +0100 Subject: Merged origin/release (checked in because wanted to merge new stuff) --- mesalib/include/EGL/eglplatform.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'mesalib/include/EGL') diff --git a/mesalib/include/EGL/eglplatform.h b/mesalib/include/EGL/eglplatform.h index 21b18fe73..2eb686590 100644 --- a/mesalib/include/EGL/eglplatform.h +++ b/mesalib/include/EGL/eglplatform.h @@ -106,7 +106,7 @@ typedef void *EGLNativeDisplayType; #elif defined(__unix__) -#ifdef MESA_EGL_NO_X11_HEADERS +#if defined(MESA_EGL_NO_X11_HEADERS) typedef void *EGLNativeDisplayType; typedef khronos_uintptr_t EGLNativePixmapType; @@ -124,8 +124,16 @@ typedef Window EGLNativeWindowType; #endif /* MESA_EGL_NO_X11_HEADERS */ +#elif __HAIKU__ +#include +typedef void *EGLNativeDisplayType; +typedef khronos_uintptr_t EGLNativePixmapType; +typedef khronos_uintptr_t EGLNativeWindowType; + #else + #error "Platform not recognized" + #endif /* EGL 1.2 types, renamed for consistency in EGL 1.3 */ -- cgit v1.2.3