From 0ca1e67d7aa6389df1e49922b6b0f531f7991136 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Sun, 9 Sep 2012 19:03:17 +0200 Subject: [PATCH] Moved X11-specific defines to X11 header. --- src/x11_egl_platform.h | 3 --- src/x11_platform.h | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/x11_egl_platform.h b/src/x11_egl_platform.h index d3e70055..b0b2c810 100644 --- a/src/x11_egl_platform.h +++ b/src/x11_egl_platform.h @@ -57,9 +57,6 @@ #define _GLFW_PLATFORM_CONTEXT_STATE _GLFWcontextEGL EGL #define _GLFW_PLATFORM_LIBRARY_OPENGL_STATE _GLFWlibraryEGL EGL -#define _GLFW_EGL_NATIVE_WINDOW window->X11.handle -#define _GLFW_EGL_NATIVE_DISPLAY _glfwLibrary.X11.display - //======================================================================== // GLFW platform specific types diff --git a/src/x11_platform.h b/src/x11_platform.h index 00ad40b8..ede4abc0 100644 --- a/src/x11_platform.h +++ b/src/x11_platform.h @@ -56,6 +56,8 @@ #if defined(_GLFW_X11_GLX) #include "x11_glx_platform.h" #elif defined(_GLFW_X11_EGL) + #define _GLFW_EGL_NATIVE_WINDOW window->X11.handle + #define _GLFW_EGL_NATIVE_DISPLAY _glfwLibrary.X11.display #include "x11_egl_platform.h" #endif