SDL: Removing SDL_Colour macro

From 9b5944a14ff3f8dac58b811d2622f195b3f1c31b Mon Sep 17 00:00:00 2001
From: Petar Popovic <[EMAIL REDACTED]>
Date: Tue, 9 Apr 2024 00:06:05 +0200
Subject: [PATCH] Removing SDL_Colour macro

---
 build-scripts/SDL_migration.cocci | 5 +++++
 docs/README-migration.md          | 3 +++
 include/SDL3/SDL_oldnames.h       | 2 ++
 include/SDL3/SDL_pixels.h         | 1 -
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/build-scripts/SDL_migration.cocci b/build-scripts/SDL_migration.cocci
index 085cef5399b53..5cbb520800867 100644
--- a/build-scripts/SDL_migration.cocci
+++ b/build-scripts/SDL_migration.cocci
@@ -3124,3 +3124,8 @@ typedef SDL_eventaction, SDL_EventAction;
 @@
 - SDL_eventaction
 + SDL_EventAction
+@@
+typedef SDL_Colour, SDL_Color;
+@@
+- SDL_Colour
++ SDL_Color
diff --git a/docs/README-migration.md b/docs/README-migration.md
index 7becc558a1a6f..d4b88cf62aa93 100644
--- a/docs/README-migration.md
+++ b/docs/README-migration.md
@@ -977,6 +977,9 @@ The following functions have been renamed:
 * SDL_MasksToPixelFormatEnum() => SDL_GetPixelFormatEnumForMasks()
 * SDL_PixelFormatEnumToMasks() => SDL_GetMasksForPixelFormatEnum()
 
+The following macros have been removed:
+* SDL_Colour - use SDL_Color instead
+
 ## SDL_platform.h
 
 The following platform preprocessor macros have been renamed:
diff --git a/include/SDL3/SDL_oldnames.h b/include/SDL3/SDL_oldnames.h
index 7d4ffe5c3ae47..482d2890a56df 100644
--- a/include/SDL3/SDL_oldnames.h
+++ b/include/SDL3/SDL_oldnames.h
@@ -388,6 +388,7 @@
 /* ##SDL_pixels.h */
 #define SDL_AllocFormat SDL_CreatePixelFormat
 #define SDL_AllocPalette SDL_CreatePalette
+#define SDL_Colour SDL_Color
 #define SDL_FreeFormat SDL_DestroyPixelFormat
 #define SDL_FreePalette SDL_DestroyPalette
 #define SDL_MasksToPixelFormatEnum SDL_GetPixelFormatEnumForMasks
@@ -888,6 +889,7 @@
 /* ##SDL_pixels.h */
 #define SDL_AllocFormat SDL_AllocFormat_renamed_SDL_CreatePixelFormat
 #define SDL_AllocPalette SDL_AllocPalette_renamed_SDL_CreatePalette
+#define SDL_Colour SDL_Colour_renamed_SDL_Color
 #define SDL_FreeFormat SDL_FreeFormat_renamed_SDL_DestroyPixelFormat
 #define SDL_FreePalette SDL_FreePalette_renamed_SDL_DestroyPalette
 #define SDL_MasksToPixelFormatEnum SDL_MasksToPixelFormatEnum_renamed_SDL_GetPixelFormatEnumForMasks
diff --git a/include/SDL3/SDL_pixels.h b/include/SDL3/SDL_pixels.h
index 209a0831ce715..21cddc59d4385 100644
--- a/include/SDL3/SDL_pixels.h
+++ b/include/SDL3/SDL_pixels.h
@@ -681,7 +681,6 @@ typedef struct SDL_Color
     Uint8 b;
     Uint8 a;
 } SDL_Color;
-#define SDL_Colour SDL_Color
 
 /**
  * The bits of this structure can be directly reinterpreted as a float-packed