Commit 7a2b6f331b2744315865370c4e611bc631cceaca
2021-02-22T13:32:42
Guard Inotify stuff with macro This fix implicit declaration of close and unused variable warning.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
diff --git a/src/joystick/hidapi/SDL_hidapijoystick.c b/src/joystick/hidapi/SDL_hidapijoystick.c
index f36ec08..12eb59f 100644
--- a/src/joystick/hidapi/SDL_hidapijoystick.c
+++ b/src/joystick/hidapi/SDL_hidapijoystick.c
@@ -61,6 +61,7 @@
#include <unistd.h>
#endif
+#if defined(SDL_USE_LIBUDEV)
typedef enum
{
ENUMERATION_UNSET,
@@ -69,6 +70,7 @@ typedef enum
} LinuxEnumerationMethod;
static LinuxEnumerationMethod linux_enumeration_method = ENUMERATION_UNSET;
+#endif
struct joystick_hwdata
{
@@ -108,7 +110,10 @@ static SDL_HIDAPI_Device *SDL_HIDAPI_devices;
static int SDL_HIDAPI_numjoysticks = 0;
static SDL_bool initialized = SDL_FALSE;
static SDL_bool shutting_down = SDL_FALSE;
+
+#if defined(HAVE_INOTIFY)
static int inotify_fd = -1;
+#endif
#if defined(SDL_USE_LIBUDEV)
static const SDL_UDEV_Symbols * usyms = NULL;
@@ -1411,10 +1416,12 @@ HIDAPI_JoystickQuit(void)
SDL_HIDAPI_QuitRumble();
+#if defined(HAVE_INOTIFY)
if (inotify_fd >= 0) {
close(inotify_fd);
inotify_fd = -1;
}
+#endif
while (SDL_HIDAPI_devices) {
HIDAPI_DelDevice(SDL_HIDAPI_devices);