From 00967cbb8a4a51ea8ff6f8b8a7efcf1f761cc664 Mon Sep 17 00:00:00 2001 From: TheBrokenRail <17478432+TheBrokenRail@users.noreply.github.com> Date: Thu, 15 Dec 2022 14:18:59 -0500 Subject: [PATCH] Linux: Fix joystick input being disabled Closes #2192 --- src/wl_init.c | 2 +- src/x11_init.c | 2 +- src/x11_window.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wl_init.c b/src/wl_init.c index 4e6b4294..7a9157a4 100644 --- a/src/wl_init.c +++ b/src/wl_init.c @@ -394,7 +394,7 @@ GLFWbool _glfwConnectWayland(int platformID, _GLFWplatform* platform) _glfwGetKeyScancodeWayland, _glfwSetClipboardStringWayland, _glfwGetClipboardStringWayland, -#if defined(_GLFW_LINUX_JOYSTICK) +#if defined(GLFW_BUILD_LINUX_JOYSTICK) _glfwInitJoysticksLinux, _glfwTerminateJoysticksLinux, _glfwPollJoystickLinux, diff --git a/src/x11_init.c b/src/x11_init.c index 1c69c0f6..a0100f2f 100644 --- a/src/x11_init.c +++ b/src/x11_init.c @@ -1184,7 +1184,7 @@ GLFWbool _glfwConnectX11(int platformID, _GLFWplatform* platform) _glfwGetKeyScancodeX11, _glfwSetClipboardStringX11, _glfwGetClipboardStringX11, -#if defined(_GLFW_LINUX_JOYSTICK) +#if defined(GLFW_BUILD_LINUX_JOYSTICK) _glfwInitJoysticksLinux, _glfwTerminateJoysticksLinux, _glfwPollJoystickLinux, diff --git a/src/x11_window.c b/src/x11_window.c index 2c46bfff..7da9b965 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -88,7 +88,7 @@ static GLFWbool waitForAnyEvent(double* timeout) { _glfw.x11.emptyEventPipe[0], POLLIN } }; -#if defined(_GLFW_LINUX_JOYSTICK) +#if defined(GLFW_BUILD_LINUX_JOYSTICK) if (_glfw.joysticksInitialized) fds[count++] = (struct pollfd) { _glfw.linjs.inotify, POLLIN }; #endif @@ -2783,7 +2783,7 @@ void _glfwPollEventsX11(void) { drainEmptyEvents(); -#if defined(_GLFW_LINUX_JOYSTICK) +#if defined(GLFW_BUILD_LINUX_JOYSTICK) if (_glfw.joysticksInitialized) _glfwDetectJoystickConnectionLinux(); #endif