From 7ca676aeed3c5f4fbc25d01ee553b72b371e0363 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Tue, 3 Sep 2024 12:52:27 -0700
Subject: [PATCH] Use ASCII characters in SDL source and headers
Fixes https://github.com/libsdl-org/SDL/issues/10636
---
include/SDL3/SDL_hints.h | 2 +-
src/joystick/SDL_joystick.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/SDL3/SDL_hints.h b/include/SDL3/SDL_hints.h
index 8433240e6c75b..708c329db2b7f 100644
--- a/include/SDL3/SDL_hints.h
+++ b/include/SDL3/SDL_hints.h
@@ -2139,7 +2139,7 @@ extern "C" {
* - "latin_letters": For keyboards using non-Latin letters, such as Russian
* or Thai, the letter keys generate keycodes as though it had an en_US
* layout. e.g. pressing the key associated with SDL_SCANCODE_A on a Russian
- * keyboard would yield 'a' instead of 'ф'.
+ * keyboard would yield 'a' instead of a Cyrillic letter.
*
* The default value for this hint is "french_numbers,latin_letters"
*
diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
index 594d3d15103b0..5c43fbadf98c2 100644
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -136,9 +136,9 @@ static Uint32 initial_arcadestick_devices[] = {
MAKE_VIDPID(0x0f0d, 0x008c), // Hori Real Arcade Pro 4
MAKE_VIDPID(0x0f0d, 0x00aa), // HORI Real Arcade Pro V Hayabusa in Switch Mode
MAKE_VIDPID(0x0f0d, 0x00ed), // Hori Fighting Stick mini 4 kai
- MAKE_VIDPID(0x0f0d, 0x011c), // Hori Fighting Stick α in PS4 Mode
- MAKE_VIDPID(0x0f0d, 0x011e), // Hori Fighting Stick α in PC Mode
- MAKE_VIDPID(0x0f0d, 0x0184), // Hori Fighting Stick α in PS5 Mode
+ MAKE_VIDPID(0x0f0d, 0x011c), // Hori Fighting Stick Alpha in PS4 Mode
+ MAKE_VIDPID(0x0f0d, 0x011e), // Hori Fighting Stick Alpha in PC Mode
+ MAKE_VIDPID(0x0f0d, 0x0184), // Hori Fighting Stick Alpha in PS5 Mode
MAKE_VIDPID(0x146b, 0x0604), // NACON Daija Arcade Stick
MAKE_VIDPID(0x1532, 0x0a00), // Razer Atrox Arcade Stick
MAKE_VIDPID(0x1bad, 0xf03d), // Street Fighter IV Arcade Stick TE - Chun Li
@@ -287,8 +287,8 @@ static Uint32 initial_flightstick_devices[] = {
MAKE_VIDPID(0x0738, 0x2221), // Saitek Pro Flight X-56 Rhino Stick
MAKE_VIDPID(0x044f, 0xb10a), // ThrustMaster, Inc. T.16000M Joystick
MAKE_VIDPID(0x046d, 0xc215), // Logitech Extreme 3D
- MAKE_VIDPID(0x231d, 0x0126), // Gunfighter Mk.III ‘Space Combat Edition’ (right)
- MAKE_VIDPID(0x231d, 0x0127), // Gunfighter Mk.III ‘Space Combat Edition’ (left)
+ MAKE_VIDPID(0x231d, 0x0126), // Gunfighter Mk.III 'Space Combat Edition' (right)
+ MAKE_VIDPID(0x231d, 0x0127), // Gunfighter Mk.III 'Space Combat Edition' (left)
MAKE_VIDPID(0x362c, 0x0001), // Yawman Arrow
};
static SDL_vidpid_list flightstick_devices = {