From f14492432d590cef90cb747a2063f6998a61f108 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 4 May 2018 23:03:56 +0200 Subject: [PATCH] Avoid exposing native GLFW3 functionality Try to avoid types conflict with Font --- src/core.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/core.c b/src/core.c index 5587f82b5..ece76138d 100644 --- a/src/core.c +++ b/src/core.c @@ -141,13 +141,7 @@ #if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB) //#define GLFW_INCLUDE_NONE // Disable the standard OpenGL header inclusion on GLFW3 #include // GLFW3 library: Windows, OpenGL context and Input management - - #if defined(__linux__) - #define GLFW_EXPOSE_NATIVE_X11 // Linux specific definitions for getting - #define GLFW_EXPOSE_NATIVE_GLX // native functions like glfwGetX11Window - #include // which are required for hiding mouse - #endif - //#include // OpenGL functions (GLFW3 already includes gl.h) + // NOTE: GLFW3 already includes gl.h (OpenGL) headers #if !defined(SUPPORT_BUSY_WAIT_LOOP) && defined(_WIN32) // NOTE: Those functions require linking with winmm library