From 69288038ed0085df09d43e76641451b9050c9329 Mon Sep 17 00:00:00 2001
From: Max Maisel <max.maisel@posteo.de>
Date: Tue, 26 Sep 2023 18:31:12 +0200
Subject: [PATCH] Refactor away some additional integer types.

---
 src/joystick/hidapi/SDL_hidapi_steam.c         | 11 +++--------
 src/joystick/hidapi/SDL_hidapi_steamdeck.c     |  9 ---------
 src/joystick/hidapi/steam/controller_structs.h | 16 ++++++++--------
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/joystick/hidapi/SDL_hidapi_steam.c b/src/joystick/hidapi/SDL_hidapi_steam.c
index aa6f18fff2..cd00e27fcd 100644
--- a/src/joystick/hidapi/SDL_hidapi_steam.c
+++ b/src/joystick/hidapi/SDL_hidapi_steam.c
@@ -29,29 +29,24 @@
 
 /*****************************************************************************************************/
 
-#include <stdint.h>
-
 #define bool SDL_bool
 #define true SDL_TRUE
 #define false SDL_FALSE
 
-typedef uint32_t uint32;
-typedef uint64_t uint64;
-
 #include "steam/controller_constants.h"
 #include "steam/controller_structs.h"
 
 typedef struct SteamControllerStateInternal_t
 {
     // Controller Type for this Controller State
-    uint32 eControllerType;
+    Uint32 eControllerType;
 
     // If packet num matches that on your prior call, then the controller state hasn't been changed since
     // your last call and there is no need to process it
-    uint32 unPacketNum;
+    Uint32 unPacketNum;
 
     // bit flags for each of the buttons
-    uint64 ulButtons;
+    Uint64 ulButtons;
 
     // Left pad coordinates
     short sLeftPadX;
diff --git a/src/joystick/hidapi/SDL_hidapi_steamdeck.c b/src/joystick/hidapi/SDL_hidapi_steamdeck.c
index a95483bd02..f04cfc8952 100644
--- a/src/joystick/hidapi/SDL_hidapi_steamdeck.c
+++ b/src/joystick/hidapi/SDL_hidapi_steamdeck.c
@@ -29,15 +29,6 @@
 
 /*****************************************************************************************************/
 
-#include <stdint.h>
-
-#define bool  SDL_bool
-#define true  SDL_TRUE
-#define false SDL_FALSE
-
-typedef uint32_t uint32;
-typedef uint64_t uint64;
-
 #include "steam/controller_constants.h"
 #include "steam/controller_structs.h"
 
diff --git a/src/joystick/hidapi/steam/controller_structs.h b/src/joystick/hidapi/steam/controller_structs.h
index d3de7338fc..d7904bee65 100644
--- a/src/joystick/hidapi/steam/controller_structs.h
+++ b/src/joystick/hidapi/steam/controller_structs.h
@@ -109,12 +109,12 @@ typedef struct
 {
 	// If packet num matches that on your prior call, then the controller state hasn't been changed since 
 	// your last call and there is no need to process it
-	uint32 unPacketNum;
+	Uint32 unPacketNum;
 	
 	// Button bitmask and trigger data.
 	union
 	{
-		uint64 ulButtons;
+		Uint64 ulButtons;
 		struct
 		{
 			unsigned char _pad0[3];
@@ -158,12 +158,12 @@ typedef struct
 {
 	// If packet num matches that on your prior call, then the controller state hasn't been changed since 
 	// your last call and there is no need to process it
-	uint32 unPacketNum;
+	Uint32 unPacketNum;
 
 	// Button bitmask and trigger data.
 	union
 	{
-		uint64 ulButtons;
+		Uint64 ulButtons;
 		struct
 		{
 			unsigned char _pad0[3];
@@ -279,16 +279,16 @@ typedef struct
 	// If packet num matches that on your prior call, then the controller
 	// state hasn't been changed since your last call and there is no need to
 	// process it
-	uint32 unPacketNum;
+	Uint32 unPacketNum;
 
 	// Button bitmask and trigger data.
 	union
 	{
-		uint64 ulButtons;
+		Uint64 ulButtons;
 		struct
 		{
-			uint32 ulButtonsL;
-			uint32 ulButtonsH;
+			Uint32 ulButtonsL;
+			Uint32 ulButtonsH;
 		};
 	};