From 7b3449b89f0625e4603f5d8681e2bac1f51a9386 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Mon, 4 Apr 2022 20:46:56 -0700
Subject: [PATCH] Minor cleanup
---
src/hidapi/SDL_hidapi.c | 8 ++++----
src/video/SDL_egl.c | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/hidapi/SDL_hidapi.c b/src/hidapi/SDL_hidapi.c
index aacff63bf03..112b07fbb3a 100644
--- a/src/hidapi/SDL_hidapi.c
+++ b/src/hidapi/SDL_hidapi.c
@@ -1185,9 +1185,9 @@ struct SDL_hid_device_info *SDL_hid_enumerate(unsigned short vendor_id, unsigned
#ifdef SDL_LIBUSB_DYNAMIC
if (libusb_ctx.libhandle) {
usb_devs = LIBUSB_hid_enumerate(vendor_id, product_id);
- #ifdef DEBUG_HIDAPI
+#ifdef DEBUG_HIDAPI
SDL_Log("libusb devices found:");
- #endif
+#endif
for (usb_dev = usb_devs; usb_dev; usb_dev = usb_dev->next) {
new_dev = (struct SDL_hid_device_info*) SDL_malloc(sizeof(struct SDL_hid_device_info));
if (!new_dev) {
@@ -1197,11 +1197,11 @@ struct SDL_hid_device_info *SDL_hid_enumerate(unsigned short vendor_id, unsigned
return NULL;
}
CopyHIDDeviceInfo(usb_dev, new_dev);
- #ifdef DEBUG_HIDAPI
+#ifdef DEBUG_HIDAPI
SDL_Log(" - %ls %ls 0x%.4hx 0x%.4hx",
usb_dev->manufacturer_string, usb_dev->product_string,
usb_dev->vendor_id, usb_dev->product_id);
- #endif
+#endif
if (last != NULL) {
last->next = new_dev;
diff --git a/src/video/SDL_egl.c b/src/video/SDL_egl.c
index b8993a34a38..e62fe9931bd 100644
--- a/src/video/SDL_egl.c
+++ b/src/video/SDL_egl.c
@@ -27,7 +27,6 @@
#endif
#if SDL_VIDEO_DRIVER_ANDROID
#include <android/native_window.h>
-#include "../core/android/SDL_android.h"
#include "../video/android/SDL_androidvideo.h"
#endif
#if SDL_VIDEO_DRIVER_RPI