From d9709904fec956524d4e9032a7fa8d0550d5d49b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Tue, 21 Nov 2023 17:36:34 +0100 Subject: [PATCH 1/3] Linux: Fix POSIX version not set for Null build When compiling GLFW on Linux with only the Null platform enabled, the CMake files did not set the required POSIX version macro. Fixes #2402 --- CONTRIBUTORS.md | 1 + src/CMakeLists.txt | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 3ad802f2..b39ee2ab 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -215,6 +215,7 @@ video tutorials. - Dmitri Shuralyov - Joao da Silva - Daniel Sieger + - Daljit Singh - Michael Skec - Daniel Skorupski - Slemmie diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5acac0d0..7b84ecf2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -316,10 +316,8 @@ if (MSVC90) endif() # Workaround for -std=c99 on Linux disabling _DEFAULT_SOURCE (POSIX 2008 and more) -if (GLFW_BUILD_X11 OR GLFW_BUILD_WAYLAND) - if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - target_compile_definitions(glfw PRIVATE _DEFAULT_SOURCE) - endif() +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") + target_compile_definitions(glfw PRIVATE _DEFAULT_SOURCE) endif() if (GLFW_BUILD_SHARED_LIBRARY) From 97820bc329c603074ecdefdfdef339be776bd9f8 Mon Sep 17 00:00:00 2001 From: Scr3amer Date: Tue, 21 Nov 2023 14:28:39 -0500 Subject: [PATCH 2/3] Null: Remove duplicated function declaration The declaration of _glfwRequestWindowAttentionNull was duplicated. Closes #2403 --- src/null_platform.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/null_platform.h b/src/null_platform.h index 6d900111..fb9374b4 100644 --- a/src/null_platform.h +++ b/src/null_platform.h @@ -239,7 +239,6 @@ void _glfwSetRawMouseMotionNull(_GLFWwindow *window, GLFWbool enabled); GLFWbool _glfwRawMouseMotionSupportedNull(void); void _glfwShowWindowNull(_GLFWwindow* window); void _glfwRequestWindowAttentionNull(_GLFWwindow* window); -void _glfwRequestWindowAttentionNull(_GLFWwindow* window); void _glfwHideWindowNull(_GLFWwindow* window); void _glfwFocusWindowNull(_GLFWwindow* window); GLFWbool _glfwWindowFocusedNull(_GLFWwindow* window); From afd22ebcf34f2fa84d5b9f28103f014505ae8d47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Tue, 21 Nov 2023 21:26:45 +0100 Subject: [PATCH 3/3] Add credit Related to #2403 --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index b39ee2ab..18db7c02 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -206,6 +206,7 @@ video tutorials. - Yoshinori Sano - Brandon Schaefer - Sebastian Schuberth + - Scr3amer - Christian Sdunek - Matt Sealey - Steve Sexton