From 81cd84f456cba4a59d3030caed105cf8bcc77ede Mon Sep 17 00:00:00 2001
From: Sylvain <[EMAIL REDACTED]>
Date: Tue, 27 Dec 2022 20:14:50 +0100
Subject: [PATCH] Remove reserved underscore SDL_joystick
---
include/SDL3/SDL_joystick.h | 4 ++--
src/joystick/SDL_sysjoystick.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/SDL3/SDL_joystick.h b/include/SDL3/SDL_joystick.h
index 97ef8be837cd..f212e8c379d6 100644
--- a/include/SDL3/SDL_joystick.h
+++ b/include/SDL3/SDL_joystick.h
@@ -70,8 +70,8 @@ extern "C" {
#ifdef SDL_THREAD_SAFETY_ANALYSIS
extern SDL_mutex *SDL_joystick_lock;
#endif
-struct _SDL_Joystick;
-typedef struct _SDL_Joystick SDL_Joystick;
+struct SDL_Joystick;
+typedef struct SDL_Joystick SDL_Joystick;
/* A structure that encodes the stable unique id for a joystick device */
typedef SDL_GUID SDL_JoystickGUID;
diff --git a/src/joystick/SDL_sysjoystick.h b/src/joystick/SDL_sysjoystick.h
index e75ec5ef6b10..56c03b71cd12 100644
--- a/src/joystick/SDL_sysjoystick.h
+++ b/src/joystick/SDL_sysjoystick.h
@@ -67,7 +67,7 @@ typedef struct SDL_JoystickSensorInfo
#define _guarded SDL_GUARDED_BY(SDL_joystick_lock)
-struct _SDL_Joystick
+struct SDL_Joystick
{
const void *magic _guarded;
@@ -119,7 +119,7 @@ struct _SDL_Joystick
int ref_count _guarded; /* Reference count for multiple opens */
- struct _SDL_Joystick *next _guarded; /* pointer to next joystick we have allocated */
+ struct SDL_Joystick *next _guarded; /* pointer to next joystick we have allocated */
};
#undef _guarded