Use C++ style comments consistently in SDL source code

Implemented using this script:

find . -type f -exec sed -i'' -e 's,/\* *\([^*]*\)\*/ *$,// \1,' -e 's, \+$,,' {} \;
git checkout \
    core/linux/SDL_evdev_kbd_default_keymap.h \
    events/imKStoUCS.* \
    hidapi \
    joystick/controller_type.c \
    joystick/controller_type.h \
    joystick/hidapi/steam/controller_constants.h \
    joystick/hidapi/steam/controller_structs.h \
    joystick/SDL_gamepad_db.h \
    libm \
    render/*/*Shader*.h \
    render/vitagxm/SDL_render_vita_gxm_shaders.h \
    render/metal/SDL_shaders_metal_*.h \
    stdlib/SDL_malloc.c \
    stdlib/SDL_qsort.c \
    stdlib/SDL_strtokr.c \
    test/ \
    video/directx/SDL_d3d12_xbox_cmacros.h \
    video/directx/d3d12.h \
    video/directx/d3d12sdklayers.h \
    video/khronos \
    video/x11/edid-parse.c \
    video/x11/xsettings-client.* \
    video/yuv2rgb
sed -i'' -e 's,/\* *\([^*]*\)\*/ *$,// \1,' -e 's, \+$,,' hidapi/SDL_hidapi.c

src/SDL.c

@@ -24,17 +24,17 @@
 #if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK)
 #include "core/windows/SDL_windows.h"
 #elif !defined(SDL_PLATFORM_WINRT)
-#include <unistd.h> /* _exit(), etc. */
+#include <unistd.h> // _exit(), etc.
 #endif
 
-/* this checks for HAVE_DBUS_DBUS_H internally. */
+// this checks for HAVE_DBUS_DBUS_H internally.
 #include "core/linux/SDL_dbus.h"
 
 #ifdef SDL_PLATFORM_EMSCRIPTEN
 #include <emscripten.h>
 #endif
 
-/* Initialization code for SDL */
+// Initialization code for SDL
 
 #include "SDL_assert_c.h"
 #include "SDL_hints_c.h"
@@ -56,7 +56,7 @@
 
 #define SDL_INIT_EVERYTHING ~0U
 
-/* Initialization/Cleanup routines */
+// Initialization/Cleanup routines
 #include "timer/SDL_timer_c.h"
 #ifdef SDL_VIDEO_DRIVER_WINDOWS
 extern int SDL_HelperWindowCreate(void);
@@ -72,7 +72,7 @@ SDL_COMPILE_TIME_ASSERT(SDL_BUILD_MICRO_VERSION,
                         SDL_MICRO_VERSION == SDL_BUILD_MICRO_VERSION);
 #endif
 
-/* Limited by its encoding in SDL_VERSIONNUM */
+// Limited by its encoding in SDL_VERSIONNUM
 SDL_COMPILE_TIME_ASSERT(SDL_MAJOR_VERSION_min, SDL_MAJOR_VERSION >= 0);
 SDL_COMPILE_TIME_ASSERT(SDL_MAJOR_VERSION_max, SDL_MAJOR_VERSION <= 10);
 SDL_COMPILE_TIME_ASSERT(SDL_MINOR_VERSION_min, SDL_MINOR_VERSION >= 0);
@@ -95,19 +95,19 @@ SDL_NORETURN void SDL_ExitProcess(int exitcode)
        ExitProcess here that will never be reached but make MingW happy. */
     ExitProcess(exitcode);
 #elif defined(SDL_PLATFORM_EMSCRIPTEN)
-    emscripten_cancel_main_loop();   /* this should "kill" the app. */
-    emscripten_force_exit(exitcode); /* this should "kill" the app. */
+    emscripten_cancel_main_loop();   // this should "kill" the app.
+    emscripten_force_exit(exitcode); // this should "kill" the app.
     exit(exitcode);
-#elif defined(SDL_PLATFORM_HAIKU)  /* Haiku has _Exit, but it's not marked noreturn. */
+#elif defined(SDL_PLATFORM_HAIKU)  // Haiku has _Exit, but it's not marked noreturn.
     _exit(exitcode);
-#elif defined(HAVE__EXIT) /* Upper case _Exit() */
+#elif defined(HAVE__EXIT) // Upper case _Exit()
     _Exit(exitcode);
 #else
     _exit(exitcode);
 #endif
 }
 
-/* App metadata */
+// App metadata
 
 int SDL_SetAppMetadata(const char *appname, const char *appversion, const char *appidentifier)
 {
@@ -171,7 +171,7 @@ const char *SDL_GetAppMetadataProperty(const char *name)
 }
 
 
-/* The initialized subsystems */
+// The initialized subsystems
 #ifdef SDL_MAIN_NEEDED
 static SDL_bool SDL_MainIsReady = SDL_FALSE;
 #else
@@ -180,7 +180,7 @@ static SDL_bool SDL_MainIsReady = SDL_TRUE;
 static SDL_bool SDL_bInMainQuit = SDL_FALSE;
 static Uint8 SDL_SubsystemRefCount[32];
 
-/* Private helper to increment a subsystem's ref counter. */
+// Private helper to increment a subsystem's ref counter.
 static void SDL_IncrementSubsystemRefCount(Uint32 subsystem)
 {
     const int subsystem_index = SDL_MostSignificantBitIndex32(subsystem);
@@ -190,7 +190,7 @@ static void SDL_IncrementSubsystemRefCount(Uint32 subsystem)
     }
 }
 
-/* Private helper to decrement a subsystem's ref counter. */
+// Private helper to decrement a subsystem's ref counter.
 static void SDL_DecrementSubsystemRefCount(Uint32 subsystem)
 {
     const int subsystem_index = SDL_MostSignificantBitIndex32(subsystem);
@@ -203,7 +203,7 @@ static void SDL_DecrementSubsystemRefCount(Uint32 subsystem)
     }
 }
 
-/* Private helper to check if a system needs init. */
+// Private helper to check if a system needs init.
 static SDL_bool SDL_ShouldInitSubsystem(Uint32 subsystem)
 {
     const int subsystem_index = SDL_MostSignificantBitIndex32(subsystem);
@@ -211,7 +211,7 @@ static SDL_bool SDL_ShouldInitSubsystem(Uint32 subsystem)
     return ((subsystem_index >= 0) && (SDL_SubsystemRefCount[subsystem_index] == 0));
 }
 
-/* Private helper to check if a system needs to be quit. */
+// Private helper to check if a system needs to be quit.
 static SDL_bool SDL_ShouldQuitSubsystem(Uint32 subsystem)
 {
     const int subsystem_index = SDL_MostSignificantBitIndex32(subsystem);
@@ -246,7 +246,7 @@ void SDL_SetMainReady(void)
     SDL_MainIsReady = SDL_TRUE;
 }
 
-/* Initialize all the subsystems that require initialization before threads start */
+// Initialize all the subsystems that require initialization before threads start
 void SDL_InitMainThread(void)
 {
     SDL_InitTLSData();
@@ -290,7 +290,7 @@ int SDL_InitSubSystem(SDL_InitFlags flags)
     }
 #endif
 
-    /* Initialize the event subsystem */
+    // Initialize the event subsystem
     if (flags & SDL_INIT_EVENTS) {
         if (SDL_ShouldInitSubsystem(SDL_INIT_EVENTS)) {
             SDL_IncrementSubsystemRefCount(SDL_INIT_EVENTS);
@@ -304,7 +304,7 @@ int SDL_InitSubSystem(SDL_InitFlags flags)
         flags_initialized |= SDL_INIT_EVENTS;
     }
 
-    /* Initialize the timer subsystem */
+    // Initialize the timer subsystem
     if (flags & SDL_INIT_TIMER) {
         if (SDL_ShouldInitSubsystem(SDL_INIT_TIMER)) {
             SDL_IncrementSubsystemRefCount(SDL_INIT_TIMER);
@@ -318,11 +318,11 @@ int SDL_InitSubSystem(SDL_InitFlags flags)
         flags_initialized |= SDL_INIT_TIMER;
     }
 
-    /* Initialize the video subsystem */
+    // Initialize the video subsystem
     if (flags & SDL_INIT_VIDEO) {
 #ifndef SDL_VIDEO_DISABLED
         if (SDL_ShouldInitSubsystem(SDL_INIT_VIDEO)) {
-            /* video implies events */
+            // video implies events
             if (!SDL_InitOrIncrementSubsystem(SDL_INIT_EVENTS)) {
                 goto quit_and_error;
             }
@@ -342,11 +342,11 @@ int SDL_InitSubSystem(SDL_InitFlags flags)
 #endif
     }
 
-    /* Initialize the audio subsystem */
+    // Initialize the audio subsystem
     if (flags & SDL_INIT_AUDIO) {
 #ifndef SDL_AUDIO_DISABLED
         if (SDL_ShouldInitSubsystem(SDL_INIT_AUDIO)) {
-            /* audio implies events */
+            // audio implies events
             if (!SDL_InitOrIncrementSubsystem(SDL_INIT_EVENTS)) {
                 goto quit_and_error;
             }
@@ -366,11 +366,11 @@ int SDL_InitSubSystem(SDL_InitFlags flags)
 #endif
     }
 
-    /* Initialize the joystick subsystem */
+    // Initialize the joystick subsystem
     if (flags & SDL_INIT_JOYSTICK) {
 #ifndef SDL_JOYSTICK_DISABLED
         if (SDL_ShouldInitSubsystem(SDL_INIT_JOYSTICK)) {
-            /* joystick implies events */
+            // joystick implies events
             if (!SDL_InitOrIncrementSubsystem(SDL_INIT_EVENTS)) {
                 goto quit_and_error;
             }
@@ -393,7 +393,7 @@ int SDL_InitSubSystem(SDL_InitFlags flags)
     if (flags & SDL_INIT_GAMEPAD) {
 #ifndef SDL_JOYSTICK_DISABLED
         if (SDL_ShouldInitSubsystem(SDL_INIT_GAMEPAD)) {
-            /* game controller implies joystick */
+            // game controller implies joystick
             if (!SDL_InitOrIncrementSubsystem(SDL_INIT_JOYSTICK)) {
                 goto quit_and_error;
             }
@@ -413,7 +413,7 @@ int SDL_InitSubSystem(SDL_InitFlags flags)
 #endif
     }
 
-    /* Initialize the haptic subsystem */
+    // Initialize the haptic subsystem
     if (flags & SDL_INIT_HAPTIC) {
 #ifndef SDL_HAPTIC_DISABLED
         if (SDL_ShouldInitSubsystem(SDL_INIT_HAPTIC)) {
@@ -432,7 +432,7 @@ int SDL_InitSubSystem(SDL_InitFlags flags)
 #endif
     }
 
-    /* Initialize the sensor subsystem */
+    // Initialize the sensor subsystem
     if (flags & SDL_INIT_SENSOR) {
 #ifndef SDL_SENSOR_DISABLED
         if (SDL_ShouldInitSubsystem(SDL_INIT_SENSOR)) {
@@ -451,11 +451,11 @@ int SDL_InitSubSystem(SDL_InitFlags flags)
 #endif
     }
 
-    /* Initialize the camera subsystem */
+    // Initialize the camera subsystem
     if (flags & SDL_INIT_CAMERA) {
 #ifndef SDL_CAMERA_DISABLED
         if (SDL_ShouldInitSubsystem(SDL_INIT_CAMERA)) {
-            /* camera implies events */
+            // camera implies events
             if (!SDL_InitOrIncrementSubsystem(SDL_INIT_EVENTS)) {
                 goto quit_and_error;
             }
@@ -475,7 +475,7 @@ int SDL_InitSubSystem(SDL_InitFlags flags)
 #endif
     }
 
-    (void)flags_initialized; /* make static analysis happy, since this only gets used in error cases. */
+    (void)flags_initialized; // make static analysis happy, since this only gets used in error cases.
 
     return SDL_ClearError();
 
@@ -491,13 +491,13 @@ int SDL_Init(SDL_InitFlags flags)
 
 void SDL_QuitSubSystem(SDL_InitFlags flags)
 {
-    /* Shut down requested initialized subsystems */
+    // Shut down requested initialized subsystems
 
 #ifndef SDL_CAMERA_DISABLED
     if (flags & SDL_INIT_CAMERA) {
         if (SDL_ShouldQuitSubsystem(SDL_INIT_CAMERA)) {
             SDL_QuitCamera();
-            /* camera implies events */
+            // camera implies events
             SDL_QuitSubSystem(SDL_INIT_EVENTS);
         }
         SDL_DecrementSubsystemRefCount(SDL_INIT_CAMERA);
@@ -517,7 +517,7 @@ void SDL_QuitSubSystem(SDL_InitFlags flags)
     if (flags & SDL_INIT_GAMEPAD) {
         if (SDL_ShouldQuitSubsystem(SDL_INIT_GAMEPAD)) {
             SDL_QuitGamepads();
-            /* game controller implies joystick */
+            // game controller implies joystick
             SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
         }
         SDL_DecrementSubsystemRefCount(SDL_INIT_GAMEPAD);
@@ -526,7 +526,7 @@ void SDL_QuitSubSystem(SDL_InitFlags flags)
     if (flags & SDL_INIT_JOYSTICK) {
         if (SDL_ShouldQuitSubsystem(SDL_INIT_JOYSTICK)) {
             SDL_QuitJoysticks();
-            /* joystick implies events */
+            // joystick implies events
             SDL_QuitSubSystem(SDL_INIT_EVENTS);
         }
         SDL_DecrementSubsystemRefCount(SDL_INIT_JOYSTICK);
@@ -546,7 +546,7 @@ void SDL_QuitSubSystem(SDL_InitFlags flags)
     if (flags & SDL_INIT_AUDIO) {
         if (SDL_ShouldQuitSubsystem(SDL_INIT_AUDIO)) {
             SDL_QuitAudio();
-            /* audio implies events */
+            // audio implies events
             SDL_QuitSubSystem(SDL_INIT_EVENTS);
         }
         SDL_DecrementSubsystemRefCount(SDL_INIT_AUDIO);
@@ -558,7 +558,7 @@ void SDL_QuitSubSystem(SDL_InitFlags flags)
         if (SDL_ShouldQuitSubsystem(SDL_INIT_VIDEO)) {
             SDL_QuitRender();
             SDL_VideoQuit();
-            /* video implies events */
+            // video implies events
             SDL_QuitSubSystem(SDL_INIT_EVENTS);
         }
         SDL_DecrementSubsystemRefCount(SDL_INIT_VIDEO);
@@ -586,7 +586,7 @@ Uint32 SDL_WasInit(SDL_InitFlags flags)
     int num_subsystems = SDL_arraysize(SDL_SubsystemRefCount);
     Uint32 initialized = 0;
 
-    /* Fast path for checking one flag */
+    // Fast path for checking one flag
     if (SDL_HasExactlyOneBitSet32(flags)) {
         int subsystem_index = SDL_MostSignificantBitIndex32(flags);
         return SDL_SubsystemRefCount[subsystem_index] ? flags : 0;
@@ -598,7 +598,7 @@ Uint32 SDL_WasInit(SDL_InitFlags flags)
 
     num_subsystems = SDL_min(num_subsystems, SDL_MostSignificantBitIndex32(flags) + 1);
 
-    /* Iterate over each bit in flags, and check the matching subsystem. */
+    // Iterate over each bit in flags, and check the matching subsystem.
     for (i = 0; i < num_subsystems; ++i) {
         if ((flags & 1) && SDL_SubsystemRefCount[i] > 0) {
             initialized |= (1 << i);
@@ -614,7 +614,7 @@ void SDL_Quit(void)
 {
     SDL_bInMainQuit = SDL_TRUE;
 
-    /* Quit all subsystems */
+    // Quit all subsystems
 #ifdef SDL_VIDEO_DRIVER_WINDOWS
     SDL_HelperWindowDestroy();
 #endif
@@ -641,13 +641,13 @@ void SDL_Quit(void)
     SDL_bInMainQuit = SDL_FALSE;
 }
 
-/* Get the library version number */
+// Get the library version number
 int SDL_GetVersion(void)
 {
     return SDL_VERSION;
 }
 
-/* Get the library source revision */
+// Get the library source revision
 const char *SDL_GetRevision(void)
 {
     return SDL_REVISION;
@@ -739,7 +739,7 @@ SDL_bool SDL_IsTablet(void)
 #ifdef SDL_PLATFORM_WIN32
 
 #if (!defined(HAVE_LIBC) || defined(__WATCOMC__)) && !defined(SDL_STATIC_LIB)
-/* FIXME: Still need to include DllMain() on Watcom C ? */
+// FIXME: Still need to include DllMain() on Watcom C ?
 
 BOOL APIENTRY MINGW32_FORCEALIGN _DllMainCRTStartup(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
 {
@@ -752,6 +752,6 @@ BOOL APIENTRY MINGW32_FORCEALIGN _DllMainCRTStartup(HANDLE hModule, DWORD ul_rea
     }
     return TRUE;
 }
-#endif /* Building DLL */
+#endif // Building DLL
 
-#endif /* defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK) */
+#endif // defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK)

src/SDL_assert.c

@@ -35,7 +35,7 @@
 
 #ifdef SDL_PLATFORM_EMSCRIPTEN
     #include <emscripten.h>
-    /* older Emscriptens don't have this, but we need to for wasm64 compatibility. */
+    // older Emscriptens don't have this, but we need to for wasm64 compatibility.
     #ifndef MAIN_THREAD_EM_ASM_PTR
         #ifdef __wasm64__
             #error You need to upgrade your Emscripten compiler to support wasm64
@@ -45,7 +45,7 @@
     #endif
 #endif
 
-/* The size of the stack buffer to use for rendering assert messages. */
+// The size of the stack buffer to use for rendering assert messages.
 #define SDL_MAX_ASSERT_MESSAGE_STACK 256
 
 static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, void *userdata);
@@ -80,7 +80,7 @@ static void SDL_AddAssertionToReport(SDL_AssertData *data)
     /* (data) is always a static struct defined with the assert macros, so
        we don't have to worry about copying or allocating them. */
     data->trigger_count++;
-    if (data->trigger_count == 1) { /* not yet added? */
+    if (data->trigger_count == 1) { // not yet added?
         data->next = triggered_assertions;
         triggered_assertions = data;
     }
@@ -105,7 +105,7 @@ static void SDL_GenerateAssertionReport(void)
 {
     const SDL_AssertData *item = triggered_assertions;
 
-    /* only do this if the app hasn't assigned an assertion handler. */
+    // only do this if the app hasn't assigned an assertion handler.
     if ((item) && (assertion_handler != SDL_PromptAssertion)) {
         debug_print("\n\nSDL assertion report.\n");
         debug_print("All SDL assertions between last init/quit:\n\n");
@@ -168,12 +168,12 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
     size_t buf_len = sizeof(stack_buf);
     int len;
 
-    (void)userdata; /* unused in default handler. */
+    (void)userdata; // unused in default handler.
 
-    /* Assume the output will fit... */
+    // Assume the output will fit...
     len = SDL_RenderAssertMessage(message, buf_len, data);
 
-    /* .. and if it didn't, try to allocate as much room as we actually need. */
+    // .. and if it didn't, try to allocate as much room as we actually need.
     if (len >= (int)buf_len) {
         if (SDL_size_add_overflow(len, 1, &buf_len) == 0) {
             message = (char *)SDL_malloc(buf_len);
@@ -185,7 +185,7 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
         }
     }
 
-    /* Something went very wrong */
+    // Something went very wrong
     if (len < 0) {
         if (message != stack_buf) {
             SDL_free(message);
@@ -195,7 +195,7 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
 
     debug_print("\n\n%s\n\n", message);
 
-    /* let env. variable override, so unit tests won't block in a GUI. */
+    // let env. variable override, so unit tests won't block in a GUI.
     const char *hint = SDL_GetHint(SDL_HINT_ASSERT);
     if (hint) {
         if (message != stack_buf) {
@@ -213,23 +213,23 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
         } else if (SDL_strcmp(hint, "always_ignore") == 0) {
             return SDL_ASSERTION_ALWAYS_IGNORE;
         } else {
-            return SDL_ASSERTION_ABORT; /* oh well. */
+            return SDL_ASSERTION_ABORT; // oh well.
         }
     }
 
-    /* Leave fullscreen mode, if possible (scary!) */
+    // Leave fullscreen mode, if possible (scary!)
     window = SDL_GetToplevelForKeyboardFocus();
     if (window) {
         if (window->fullscreen_exclusive) {
             SDL_MinimizeWindow(window);
         } else {
-            /* !!! FIXME: ungrab the input if we're not fullscreen? */
-            /* No need to mess with the window */
+            // !!! FIXME: ungrab the input if we're not fullscreen?
+            // No need to mess with the window
             window = NULL;
         }
     }
 
-    /* Show a messagebox if we can, otherwise fall back to stdio */
+    // Show a messagebox if we can, otherwise fall back to stdio
     SDL_zero(messagebox);
     messagebox.flags = SDL_MESSAGEBOX_WARNING;
     messagebox.window = window;
@@ -246,10 +246,10 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
         }
     } else {
 #ifdef SDL_PLATFORM_EMSCRIPTEN
-        /* This is nasty, but we can't block on a custom UI. */
+        // This is nasty, but we can't block on a custom UI.
         for (;;) {
             SDL_bool okay = SDL_TRUE;
-            /* *INDENT-OFF* */ /* clang-format off */
+            /* *INDENT-OFF* */ // clang-format off
             char *buf = (char *) MAIN_THREAD_EM_ASM_PTR({
                 var str =
                     UTF8ToString($0) + '\n\n' +
@@ -260,11 +260,11 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
                 }
                 return allocate(intArrayFromString(reply), 'i8', ALLOC_NORMAL);
             }, message);
-            /* *INDENT-ON* */ /* clang-format on */
+            /* *INDENT-ON* */ // clang-format on
 
             if (SDL_strcmp(buf, "a") == 0) {
                 state = SDL_ASSERTION_ABORT;
-#if 0 /* (currently) no break functionality on Emscripten */
+#if 0 // (currently) no break functionality on Emscripten
             } else if (SDL_strcmp(buf, "b") == 0) {
                 state = SDL_ASSERTION_BREAK;
 #endif
@@ -277,14 +277,14 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
             } else {
                 okay = SDL_FALSE;
             }
-            free(buf);  /* This should NOT be SDL_free() */
+            free(buf);  // This should NOT be SDL_free()
 
             if (okay) {
                 break;
             }
         }
 #elif defined(HAVE_STDIO_H)
-        /* this is a little hacky. */
+        // this is a little hacky.
         for (;;) {
             char buf[32];
             (void)fprintf(stderr, "Abort/Break/Retry/Ignore/AlwaysIgnore? [abriA] : ");
@@ -310,10 +310,10 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
                 break;
             }
         }
-#endif /* HAVE_STDIO_H */
+#endif // HAVE_STDIO_H
     }
 
-    /* Re-enter fullscreen mode */
+    // Re-enter fullscreen mode
     if (window) {
         SDL_RestoreWindow(window);
     }
@@ -333,19 +333,19 @@ SDL_AssertState SDL_ReportAssertion(SDL_AssertData *data, const char *func, cons
 #ifndef SDL_THREADS_DISABLED
     static SDL_SpinLock spinlock = 0;
     SDL_LockSpinlock(&spinlock);
-    if (!assertion_mutex) { /* never called SDL_Init()? */
+    if (!assertion_mutex) { // never called SDL_Init()?
         assertion_mutex = SDL_CreateMutex();
         if (!assertion_mutex) {
             SDL_UnlockSpinlock(&spinlock);
-            return SDL_ASSERTION_IGNORE; /* oh well, I guess. */
+            return SDL_ASSERTION_IGNORE; // oh well, I guess.
         }
     }
     SDL_UnlockSpinlock(&spinlock);
 
     SDL_LockMutex(assertion_mutex);
-#endif /* !SDL_THREADS_DISABLED */
+#endif // !SDL_THREADS_DISABLED
 
-    /* doing this because Visual C is upset over assigning in the macro. */
+    // doing this because Visual C is upset over assigning in the macro.
     if (data->trigger_count == 0) {
         data->function = func;
         data->filename = file;
@@ -355,13 +355,13 @@ SDL_AssertState SDL_ReportAssertion(SDL_AssertData *data, const char *func, cons
     SDL_AddAssertionToReport(data);
 
     assertion_running++;
-    if (assertion_running > 1) { /* assert during assert! Abort. */
+    if (assertion_running > 1) { // assert during assert! Abort.
         if (assertion_running == 2) {
             SDL_AbortAssertion();
-        } else if (assertion_running == 3) { /* Abort asserted! */
+        } else if (assertion_running == 3) { // Abort asserted!
             SDL_ExitProcess(42);
         } else {
-            while (1) { /* do nothing but spin; what else can you do?! */
+            while (1) { // do nothing but spin; what else can you do?!
             }
         }
     }
@@ -379,11 +379,11 @@ SDL_AssertState SDL_ReportAssertion(SDL_AssertData *data, const char *func, cons
     case SDL_ASSERTION_IGNORE:
     case SDL_ASSERTION_RETRY:
     case SDL_ASSERTION_BREAK:
-        break; /* macro handles these. */
+        break; // macro handles these.
 
     case SDL_ASSERTION_ABORT:
         SDL_AbortAssertion();
-        /*break;  ...shouldn't return, but oh well. */
+        // break;  ...shouldn't return, but oh well.
     }
 
     assertion_running--;
@@ -405,7 +405,7 @@ void SDL_AssertionsQuit(void)
         assertion_mutex = NULL;
     }
 #endif
-#endif /* SDL_ASSERT_LEVEL > 0 */
+#endif // SDL_ASSERT_LEVEL > 0
 }
 
 void SDL_SetAssertionHandler(SDL_AssertionHandler handler, void *userdata)

src/SDL_assert_c.h

@@ -25,4 +25,4 @@
 
 extern void SDL_AssertionsQuit(void);
 
-#endif /* SDL_assert_c_h_ */
+#endif // SDL_assert_c_h_

src/SDL_error.c

@@ -20,13 +20,13 @@
 */
 #include "SDL_internal.h"
 
-/* Simple error handling in SDL */
+// Simple error handling in SDL
 
 #include "SDL_error_c.h"
 
 int SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
 {
-    /* Ignore call if invalid format pointer was passed */
+    // Ignore call if invalid format pointer was passed
     if (fmt) {
         va_list ap;
         int result;
@@ -51,7 +51,7 @@ int SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
         }
 
         if (SDL_GetLogPriority(SDL_LOG_CATEGORY_ERROR) <= SDL_LOG_PRIORITY_DEBUG) {
-            /* If we are in debug mode, print out the error message */
+            // If we are in debug mode, print out the error message
             SDL_LogDebug(SDL_LOG_CATEGORY_ERROR, "%s", error->str);
         }
     }

src/SDL_error_c.h

@@ -43,7 +43,7 @@ typedef struct SDL_error
     SDL_free_func free_func;
 } SDL_error;
 
-/* Defined in SDL_thread.c */
+// Defined in SDL_thread.c
 extern SDL_error *SDL_GetErrBuf(SDL_bool create);
 
-#endif /* SDL_error_c_h_ */
+#endif // SDL_error_c_h_

src/SDL_guid.c

@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-/* convert the guid to a printable string */
+// convert the guid to a printable string
 void SDL_GUIDToString(SDL_GUID guid, char *pszGUID, int cbGUID)
 {
     static const char k_rgchHexToASCII[] = "0123456789abcdef";
@@ -31,8 +31,8 @@ void SDL_GUIDToString(SDL_GUID guid, char *pszGUID, int cbGUID)
     }
 
     for (i = 0; i < sizeof(guid.data) && i < (cbGUID - 1) / 2; i++) {
-        /* each input byte writes 2 ascii chars, and might write a null byte. */
-        /* If we don't have room for next input byte, stop */
+        // each input byte writes 2 ascii chars, and might write a null byte.
+        // If we don't have room for next input byte, stop
         unsigned char c = guid.data[i];
 
         *pszGUID++ = k_rgchHexToASCII[c >> 4];
@@ -60,12 +60,12 @@ static unsigned char nibble(unsigned char c)
         return c - 'a' + 0x0a;
     }
 
-    /* received an invalid character, and no real way to return an error */
-    /* AssertMsg1(false, "Q_nibble invalid hex character '%c' ", c); */
+    // received an invalid character, and no real way to return an error
+    // AssertMsg1(false, "Q_nibble invalid hex character '%c' ", c);
     return 0;
 }
 
-/* convert the string version of a guid to the struct */
+// convert the string version of a guid to the struct
 SDL_GUID SDL_StringToGUID(const char *pchGUID)
 {
     SDL_GUID guid;
@@ -74,7 +74,7 @@ SDL_GUID SDL_StringToGUID(const char *pchGUID)
     Uint8 *p;
     size_t i;
 
-    /* Make sure it's even */
+    // Make sure it's even
     len = (len) & ~0x1;
 
     SDL_memset(&guid, 0x00, sizeof(guid));

src/SDL_hashtable.h

@@ -21,7 +21,7 @@
 #ifndef SDL_hashtable_h_
 #define SDL_hashtable_h_
 
-/* this is not (currently) a public API. But maybe it should be! */
+// this is not (currently) a public API. But maybe it should be!
 
 struct SDL_HashTable;
 typedef struct SDL_HashTable SDL_HashTable;
@@ -57,4 +57,4 @@ extern SDL_bool SDL_KeyMatchID(const void *a, const void *b, void *unused);
 
 extern void SDL_NukeFreeValue(const void *key, const void *value, void *unused);
 
-#endif /* SDL_hashtable_h_ */
+#endif // SDL_hashtable_h_

src/SDL_hints_c.h

@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-/* This file defines useful function for working with SDL hints */
+// This file defines useful function for working with SDL hints
 
 #ifndef SDL_hints_c_h_
 #define SDL_hints_c_h_
@@ -30,4 +30,4 @@ extern SDL_bool SDL_GetStringBoolean(const char *value, SDL_bool default_value);
 extern int SDL_GetStringInteger(const char *value, int default_value);
 extern void SDL_QuitHints(void);
 
-#endif /* SDL_hints_c_h_ */
+#endif // SDL_hints_c_h_

src/SDL_internal.h

@@ -21,12 +21,12 @@
 #ifndef SDL_internal_h_
 #define SDL_internal_h_
 
-/* Many of SDL's features require _GNU_SOURCE on various platforms */
+// Many of SDL's features require _GNU_SOURCE on various platforms
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
 
-/* Need this so Linux systems define fseek64o, ftell64o and off64_t */
+// Need this so Linux systems define fseek64o, ftell64o and off64_t
 #ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE 1
 #endif
@@ -44,11 +44,11 @@
 #define HAVE_GCC_DIAGNOSTIC_PRAGMA 1
 #endif
 
-#ifdef _MSC_VER /* We use constant comparison for generated code */
+#ifdef _MSC_VER // We use constant comparison for generated code
 #pragma warning(disable : 6326)
 #endif
 
-#ifdef _MSC_VER /* SDL_MAX_SMALL_ALLOC_STACKSIZE is smaller than _ALLOCA_S_THRESHOLD and should be generally safe */
+#ifdef _MSC_VER // SDL_MAX_SMALL_ALLOC_STACKSIZE is smaller than _ALLOCA_S_THRESHOLD and should be generally safe
 #pragma warning(disable : 6255)
 #endif
 #define SDL_MAX_SMALL_ALLOC_STACKSIZE          128
@@ -76,7 +76,7 @@
 
 #ifdef SDL_PLATFORM_APPLE
 #ifndef _DARWIN_C_SOURCE
-#define _DARWIN_C_SOURCE 1 /* for memset_pattern4() */
+#define _DARWIN_C_SOURCE 1 // for memset_pattern4()
 #endif
 #endif
 
@@ -121,7 +121,7 @@
 #include <float.h>
 #endif
 
-/* If you run into a warning that O_CLOEXEC is redefined, update the SDL configuration header for your platform to add HAVE_O_CLOEXEC */
+// If you run into a warning that O_CLOEXEC is redefined, update the SDL configuration header for your platform to add HAVE_O_CLOEXEC
 #ifndef HAVE_O_CLOEXEC
 #define O_CLOEXEC 0
 #endif
@@ -192,7 +192,7 @@
 #endif
 
 #ifndef SDL_RENDER_DISABLED
-/* define the not defined ones as 0 */
+// define the not defined ones as 0
 #ifndef SDL_VIDEO_RENDER_D3D
 #define SDL_VIDEO_RENDER_D3D 0
 #endif
@@ -223,7 +223,7 @@
 #ifndef SDL_VIDEO_RENDER_VULKAN
 #define SDL_VIDEO_RENDER_VULKAN 0
 #endif
-#else /* define all as 0 */
+#else // define all as 0
 #undef SDL_VIDEO_RENDER_SW
 #define SDL_VIDEO_RENDER_SW 0
 #undef SDL_VIDEO_RENDER_D3D
@@ -246,7 +246,7 @@
 #define SDL_VIDEO_RENDER_VITA_GXM 0
 #undef SDL_VIDEO_RENDER_VULKAN
 #define SDL_VIDEO_RENDER_VULKAN 0
-#endif /* SDL_RENDER_DISABLED */
+#endif // SDL_RENDER_DISABLED
 
 #define SDL_HAS_RENDER_DRIVER \
        (SDL_VIDEO_RENDER_SW       | \
@@ -276,17 +276,17 @@
 #include <SDL3/SDL.h>
 #include <SDL3/SDL_intrin.h>
 
-#define SDL_MAIN_NOIMPL /* don't drag in header-only implementation of SDL_main */
+#define SDL_MAIN_NOIMPL // don't drag in header-only implementation of SDL_main
 #include <SDL3/SDL_main.h>
 
-/* Set up for C function definitions, even when using C++ */
+// Set up for C function definitions, even when using C++
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "SDL_utils_c.h"
 
-/* Do any initialization that needs to happen before threads are started */
+// Do any initialization that needs to happen before threads are started
 extern void SDL_InitMainThread(void);
 
 /* The internal implementations of these functions have up to nanosecond precision.
@@ -296,9 +296,9 @@ extern int SDLCALL SDL_WaitSemaphoreTimeoutNS(SDL_Semaphore *sem, Sint64 timeout
 extern int SDLCALL SDL_WaitConditionTimeoutNS(SDL_Condition *cond, SDL_Mutex *mutex, Sint64 timeoutNS);
 extern SDL_bool SDLCALL SDL_WaitEventTimeoutNS(SDL_Event *event, Sint64 timeoutNS);
 
-/* Ends C function definitions when using C++ */
+// Ends C function definitions when using C++
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* SDL_internal_h_ */
+#endif // SDL_internal_h_

src/SDL_list.c

@@ -22,7 +22,7 @@
 
 #include "./SDL_list.h"
 
-/* Push */
+// Push
 int SDL_ListAdd(SDL_ListNode **head, void *ent)
 {
     SDL_ListNode *node = (SDL_ListNode *)SDL_malloc(sizeof(*node));
@@ -37,12 +37,12 @@ int SDL_ListAdd(SDL_ListNode **head, void *ent)
     return 0;
 }
 
-/* Pop from end as a FIFO (if add with SDL_ListAdd) */
+// Pop from end as a FIFO (if add with SDL_ListAdd)
 void SDL_ListPop(SDL_ListNode **head, void **ent)
 {
     SDL_ListNode **ptr = head;
 
-    /* Invalid or empty */
+    // Invalid or empty
     if (!head || !*head) {
         return;
     }

src/SDL_list.h

@@ -33,4 +33,4 @@ void SDL_ListPop(SDL_ListNode **head, void **ent);
 void SDL_ListRemove(SDL_ListNode **head, void *ent);
 void SDL_ListClear(SDL_ListNode **head);
 
-#endif /* SDL_list_h_ */
+#endif // SDL_list_h_

src/SDL_log.c

@@ -24,7 +24,7 @@
 #include "core/windows/SDL_windows.h"
 #endif
 
-/* Simple log messages in SDL */
+// Simple log messages in SDL
 
 #include "SDL_log_c.h"
 
@@ -38,7 +38,7 @@
 
 #include "stdlib/SDL_vacopy.h"
 
-/* The size of the stack buffer to use for rendering log messages. */
+// The size of the stack buffer to use for rendering log messages.
 #define SDL_MAX_LOG_MESSAGE_STACK 256
 
 #define DEFAULT_CATEGORY -1
@@ -51,7 +51,7 @@ typedef struct SDL_LogLevel
 } SDL_LogLevel;
 
 
-/* The default log output function */
+// The default log output function
 static void SDLCALL SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority, const char *message);
 
 static void SDL_ResetLogPrefixes(void);
@@ -68,7 +68,7 @@ static SDL_Mutex *log_function_mutex = NULL;
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #endif
 
-/* If this list changes, update the documentation for SDL_HINT_LOGGING */
+// If this list changes, update the documentation for SDL_HINT_LOGGING
 static const char * const SDL_priority_names[] = {
     NULL,
     "VERBOSE",
@@ -82,7 +82,7 @@ SDL_COMPILE_TIME_ASSERT(priority_names, SDL_arraysize(SDL_priority_names) == SDL
 
 static const char *SDL_priority_prefixes[SDL_NUM_LOG_PRIORITIES];
 
-/* If this list changes, update the documentation for SDL_HINT_LOGGING */
+// If this list changes, update the documentation for SDL_HINT_LOGGING
 static const char * const SDL_category_names[] = {
     "APP",
     "ERROR",
@@ -110,12 +110,12 @@ static int SDL_android_priority[SDL_NUM_LOG_PRIORITIES] = {
     ANDROID_LOG_ERROR,
     ANDROID_LOG_FATAL
 };
-#endif /* SDL_PLATFORM_ANDROID */
+#endif // SDL_PLATFORM_ANDROID
 
 void SDL_InitLog(void)
 {
     if (!log_function_mutex) {
-        /* if this fails we'll try to continue without it. */
+        // if this fails we'll try to continue without it.
         log_function_mutex = SDL_CreateMutex();
     }
 }
@@ -154,7 +154,7 @@ void SDL_SetLogPriority(int category, SDL_LogPriority priority)
         }
     }
 
-    /* Create a new entry */
+    // Create a new entry
     entry = (SDL_LogLevel *)SDL_malloc(sizeof(*entry));
     if (entry) {
         entry->category = category;
@@ -194,7 +194,7 @@ static SDL_bool SDL_ParseLogPriority(const char *string, size_t length, SDL_LogP
     if (SDL_isdigit(*string)) {
         i = SDL_atoi(string);
         if (i == 0) {
-            /* 0 has a special meaning of "disable this category" */
+            // 0 has a special meaning of "disable this category"
             *priority = SDL_NUM_LOG_PRIORITIES;
             return SDL_TRUE;
         }
@@ -439,7 +439,7 @@ static const char *GetCategoryPrefix(int category)
     }
     return "CUSTOM";
 }
-#endif /* SDL_PLATFORM_ANDROID */
+#endif // SDL_PLATFORM_ANDROID
 
 void SDL_LogMessageV(int category, SDL_LogPriority priority, SDL_PRINTF_FORMAT_STRING const char *fmt, va_list ap)
 {
@@ -449,27 +449,27 @@ void SDL_LogMessageV(int category, SDL_LogPriority priority, SDL_PRINTF_FORMAT_S
     int len;
     va_list aq;
 
-    /* Nothing to do if we don't have an output function */
+    // Nothing to do if we don't have an output function
     if (!SDL_log_function) {
         return;
     }
 
-    /* Make sure we don't exceed array bounds */
+    // Make sure we don't exceed array bounds
     if ((int)priority < 0 || priority >= SDL_NUM_LOG_PRIORITIES) {
         return;
     }
 
-    /* See if we want to do anything with this message */
+    // See if we want to do anything with this message
     if (priority < SDL_GetLogPriority(category)) {
         return;
     }
 
     if (!log_function_mutex) {
-        /* this mutex creation can race if you log from two threads at startup. You should have called SDL_Init first! */
+        // this mutex creation can race if you log from two threads at startup. You should have called SDL_Init first!
         log_function_mutex = SDL_CreateMutex();
     }
 
-    /* Render into stack buffer */
+    // Render into stack buffer
     va_copy(aq, ap);
     len = SDL_vsnprintf(stack_buf, sizeof(stack_buf), fmt, aq);
     va_end(aq);
@@ -478,9 +478,9 @@ void SDL_LogMessageV(int category, SDL_LogPriority priority, SDL_PRINTF_FORMAT_S
         return;
     }
 
-    /* If message truncated, allocate and re-render */
+    // If message truncated, allocate and re-render
     if (len >= sizeof(stack_buf) && SDL_size_add_overflow(len, 1, &len_plus_term) == 0) {
-        /* Allocate exactly what we need, including the zero-terminator */
+        // Allocate exactly what we need, including the zero-terminator
         message = (char *)SDL_malloc(len_plus_term);
         if (!message) {
             return;
@@ -492,10 +492,10 @@ void SDL_LogMessageV(int category, SDL_LogPriority priority, SDL_PRINTF_FORMAT_S
         message = stack_buf;
     }
 
-    /* Chop off final endline. */
+    // Chop off final endline.
     if ((len > 0) && (message[len - 1] == '\n')) {
         message[--len] = '\0';
-        if ((len > 0) && (message[len - 1] == '\r')) { /* catch "\r\n", too. */
+        if ((len > 0) && (message[len - 1] == '\r')) { // catch "\r\n", too.
             message[--len] = '\0';
         }
     }
@@ -504,7 +504,7 @@ void SDL_LogMessageV(int category, SDL_LogPriority priority, SDL_PRINTF_FORMAT_S
     SDL_log_function(SDL_log_userdata, category, priority, message);
     SDL_UnlockMutex(log_function_mutex);
 
-    /* Free only if dynamically allocated */
+    // Free only if dynamically allocated
     if (message != stack_buf) {
         SDL_free(message);
     }
@@ -519,7 +519,7 @@ enum {
     CONSOLE_ATTACHED_ERROR = -1,
 } consoleAttached = CONSOLE_UNATTACHED;
 
-/* Handle to stderr output of console. */
+// Handle to stderr output of console.
 static HANDLE stderrHandle = NULL;
 #endif
 
@@ -527,8 +527,8 @@ static void SDLCALL SDL_LogOutput(void *userdata, int category, SDL_LogPriority
                                   const char *message)
 {
 #if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_WINRT) || defined(SDL_PLATFORM_GDK)
-    /* Way too many allocations here, urgh */
-    /* Note: One can't call SDL_SetError here, since that function itself logs. */
+    // Way too many allocations here, urgh
+    // Note: One can't call SDL_SetError here, since that function itself logs.
     {
         char *output;
         size_t length;
@@ -543,27 +543,27 @@ static void SDLCALL SDL_LogOutput(void *userdata, int category, SDL_LogPriority
         DWORD charsWritten;
 #endif
 
-        /* Maybe attach console and get stderr handle */
+        // Maybe attach console and get stderr handle
         if (consoleAttached == CONSOLE_UNATTACHED) {
             attachResult = AttachConsole(ATTACH_PARENT_PROCESS);
             if (!attachResult) {
                 attachError = GetLastError();
                 if (attachError == ERROR_INVALID_HANDLE) {
-                    /* This is expected when running from Visual Studio */
-                    /*OutputDebugString(TEXT("Parent process has no console\r\n"));*/
+                    // This is expected when running from Visual Studio
+                    // OutputDebugString(TEXT("Parent process has no console\r\n"));
                     consoleAttached = CONSOLE_ATTACHED_MSVC;
                 } else if (attachError == ERROR_GEN_FAILURE) {
                     OutputDebugString(TEXT("Could not attach to console of parent process\r\n"));
                     consoleAttached = CONSOLE_ATTACHED_ERROR;
                 } else if (attachError == ERROR_ACCESS_DENIED) {
-                    /* Already attached */
+                    // Already attached
                     consoleAttached = CONSOLE_ATTACHED_CONSOLE;
                 } else {
                     OutputDebugString(TEXT("Error attaching console\r\n"));
                     consoleAttached = CONSOLE_ATTACHED_ERROR;
                 }
             } else {
-                /* Newly attached */
+                // Newly attached
                 consoleAttached = CONSOLE_ATTACHED_CONSOLE;
             }
 
@@ -571,12 +571,12 @@ static void SDLCALL SDL_LogOutput(void *userdata, int category, SDL_LogPriority
                 stderrHandle = GetStdHandle(STD_ERROR_HANDLE);
 
                 if (GetConsoleMode(stderrHandle, &consoleMode) == 0) {
-                    /* WriteConsole fails if the output is redirected to a file. Must use WriteFile instead. */
+                    // WriteConsole fails if the output is redirected to a file. Must use WriteFile instead.
                     consoleAttached = CONSOLE_ATTACHED_FILE;
                 }
             }
         }
-#endif /* !defined(HAVE_STDIO_H) && !defined(SDL_PLATFORM_WINRT) && !defined(SDL_PLATFORM_GDK) */
+#endif // !defined(HAVE_STDIO_H) && !defined(SDL_PLATFORM_WINRT) && !defined(SDL_PLATFORM_GDK)
         length = SDL_strlen(SDL_GetLogPriorityPrefix(priority)) + SDL_strlen(message) + 1 + 1 + 1;
         output = SDL_small_alloc(char, length, &isstack);
         (void)SDL_snprintf(output, length, "%s%s\r\n", SDL_GetLogPriorityPrefix(priority), message);
@@ -584,18 +584,18 @@ static void SDLCALL SDL_LogOutput(void *userdata, int category, SDL_LogPriority
 
 
 #if defined(HAVE_STDIO_H) && !defined(SDL_PLATFORM_WINRT) && !defined(SDL_PLATFORM_GDK)
-        /* When running in MSVC and using stdio, rely on forwarding of stderr to the debug stream */
+        // When running in MSVC and using stdio, rely on forwarding of stderr to the debug stream
         if (consoleAttached != CONSOLE_ATTACHED_MSVC) {
-            /* Output to debugger */
+            // Output to debugger
             OutputDebugString(tstr);
         }
 #else
-        /* Output to debugger */
+        // Output to debugger
         OutputDebugString(tstr);
 #endif
 
 #if !defined(HAVE_STDIO_H) && !defined(SDL_PLATFORM_WINRT) && !defined(SDL_PLATFORM_GDK)
-        /* Screen output to stderr, if console was attached. */
+        // Screen output to stderr, if console was attached.
         if (consoleAttached == CONSOLE_ATTACHED_CONSOLE) {
             if (!WriteConsole(stderrHandle, tstr, (DWORD)SDL_tcslen(tstr), &charsWritten, NULL)) {
                 OutputDebugString(TEXT("Error calling WriteConsole\r\n"));
@@ -609,7 +609,7 @@ static void SDLCALL SDL_LogOutput(void *userdata, int category, SDL_LogPriority
                 OutputDebugString(TEXT("Error calling WriteFile\r\n"));
             }
         }
-#endif /* !defined(HAVE_STDIO_H) && !defined(SDL_PLATFORM_WINRT) && !defined(SDL_PLATFORM_GDK) */
+#endif // !defined(HAVE_STDIO_H) && !defined(SDL_PLATFORM_WINRT) && !defined(SDL_PLATFORM_GDK)
 
         SDL_free(tstr);
         SDL_small_free(output, isstack);

src/SDL_log_c.h

@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-/* This file defines useful function for working with SDL logging */
+// This file defines useful function for working with SDL logging
 
 #ifndef SDL_log_c_h_
 #define SDL_log_c_h_
@@ -28,4 +28,4 @@
 extern void SDL_InitLog(void);
 extern void SDL_QuitLog(void);
 
-#endif /* SDL_log_c_h_ */
+#endif // SDL_log_c_h_

src/SDL_properties.c

@@ -177,7 +177,7 @@ SDL_PropertiesID SDL_CreateProperties(void)
     SDL_UnlockMutex(SDL_properties_lock);
 
     if (inserted) {
-        /* All done! */
+        // All done!
         return props;
     }
 
@@ -225,7 +225,7 @@ int SDL_CopyProperties(SDL_PropertiesID src, SDL_PropertiesID dst)
             SDL_Property *dst_property;
 
             if (src_property->cleanup) {
-                /* Can't copy properties with cleanup functions, we don't know how to duplicate the data */
+                // Can't copy properties with cleanup functions, we don't know how to duplicate the data
                 continue;
             }
 

src/SDL_utils.c

@@ -26,18 +26,18 @@
 #include <unistd.h>
 #endif
 
-/* Common utility functions that aren't in the public API */
+// Common utility functions that aren't in the public API
 
 int SDL_powerof2(int x)
 {
     int value;
 
     if (x <= 0) {
-        /* Return some sane value - we shouldn't hit this in our use cases */
+        // Return some sane value - we shouldn't hit this in our use cases
         return 1;
     }
 
-    /* This trick works for 32-bit values */
+    // This trick works for 32-bit values
     {
         SDL_COMPILE_TIME_ASSERT(SDL_powerof2, sizeof(x) == sizeof(Uint32));
     }
@@ -105,7 +105,7 @@ SDL_bool SDL_endswith(const char *string, const char *suffix)
     return SDL_FALSE;
 }
 
-/* Assume we can wrap SDL_AtomicInt values and cast to Uint32 */
+// Assume we can wrap SDL_AtomicInt values and cast to Uint32
 SDL_COMPILE_TIME_ASSERT(sizeof_object_id, sizeof(int) == sizeof(Uint32));
 
 Uint32 SDL_GetNextObjectID(void)
@@ -165,7 +165,7 @@ SDL_bool SDL_ObjectValid(void *object, SDL_ObjectType type)
 void SDL_SetObjectsInvalid(void)
 {
     if (SDL_objects) {
-        /* Log any leaked objects */
+        // Log any leaked objects
         const void *object, *object_type;
         void *iter = NULL;
         while (SDL_IterateHashTable(SDL_objects, &object, &object_type, &iter)) {
@@ -223,13 +223,13 @@ static int SDL_URIDecode(const char *src, char *dst, int len)
     }
     for (ri = 0, wi = 0, di = 0; ri < len && wi < len; ri += 1) {
         if (di == 0) {
-            /* start decoding */
+            // start decoding
             if (src[ri] == '%') {
                 decode = '\0';
                 di += 1;
                 continue;
             }
-            /* normal write */
+            // normal write
             dst[wi] = src[ri];
             wi += 1;
         } else if (di == 1 || di == 2) {
@@ -238,7 +238,7 @@ static int SDL_URIDecode(const char *src, char *dst, int len)
             char isA = src[ri] >= 'A' && src[ri] <= 'F';
             char isn = src[ri] >= '0' && src[ri] <= '9';
             if (!(isa || isA || isn)) {
-                /* not a hexadecimal */
+                // not a hexadecimal
                 int sri;
                 for (sri = ri - di; sri <= ri; sri += 1) {
                     dst[wi] = src[sri];
@@ -247,7 +247,7 @@ static int SDL_URIDecode(const char *src, char *dst, int len)
                 di = 0;
                 continue;
             }
-            /* itsy bitsy magicsy */
+            // itsy bitsy magicsy
             if (isn) {
                 off = 0 - '0';
             } else if (isa) {
@@ -272,14 +272,14 @@ static int SDL_URIDecode(const char *src, char *dst, int len)
 int SDL_URIToLocal(const char *src, char *dst)
 {
     if (SDL_memcmp(src, "file:/", 6) == 0) {
-        src += 6; /* local file? */
+        src += 6; // local file?
     } else if (SDL_strstr(src, ":/") != NULL) {
-        return -1; /* wrong scheme */
+        return -1; // wrong scheme
     }
 
     SDL_bool local = src[0] != '/' || (src[0] != '\0' && src[1] == '/');
 
-    /* Check the hostname, if present. RFC 3986 states that the hostname component of a URI is not case-sensitive. */
+    // Check the hostname, if present. RFC 3986 states that the hostname component of a URI is not case-sensitive.
     if (!local && src[0] == '/' && src[2] != '/') {
         char *hostname_end = SDL_strchr(src + 1, '/');
         if (hostname_end) {
@@ -310,7 +310,7 @@ int SDL_URIToLocal(const char *src, char *dst)
     }
 
     if (local) {
-        /* Convert URI escape sequences to real characters */
+        // Convert URI escape sequences to real characters
         if (src[0] == '/') {
             src++;
         } else {

src/SDL_utils_c.h

@@ -23,9 +23,9 @@
 #ifndef SDL_utils_h_
 #define SDL_utils_h_
 
-/* Common utility functions that aren't in the public API */
+// Common utility functions that aren't in the public API
 
-/* Return the smallest power of 2 greater than or equal to 'x' */
+// Return the smallest power of 2 greater than or equal to 'x'
 extern int SDL_powerof2(int x);
 
 extern void SDL_CalculateFraction(float x, int *numerator, int *denominator);
@@ -67,4 +67,4 @@ extern void SDL_SetObjectsInvalid(void);
 
 extern const char *SDL_GetPersistentString(const char *string);
 
-#endif /* SDL_utils_h_ */
+#endif // SDL_utils_h_

src/atomic/SDL_atomic.c

@@ -25,7 +25,7 @@
 #define HAVE_MSC_ATOMICS 1
 #endif
 
-#ifdef SDL_PLATFORM_MACOS /* !!! FIXME: should we favor gcc atomics? */
+#ifdef SDL_PLATFORM_MACOS // !!! FIXME: should we favor gcc atomics?
 #include <libkern/OSAtomic.h>
 #endif
 
@@ -33,7 +33,7 @@
 #include <atomic.h>
 #endif
 
-/* The __atomic_load_n() intrinsic showed up in different times for different compilers. */
+// The __atomic_load_n() intrinsic showed up in different times for different compilers.
 #ifdef __clang__
 #if __has_builtin(__atomic_load_n) || defined(HAVE_GCC_ATOMICS)
 /* !!! FIXME: this advertises as available in the NDK but uses an external symbol we don't have.
@@ -48,7 +48,7 @@
 #endif
 #endif
 
-/* *INDENT-OFF* */ /* clang-format off */
+/* *INDENT-OFF* */ // clang-format off
 #if defined(__WATCOMC__) && defined(__386__)
 SDL_COMPILE_TIME_ASSERT(intsize, 4==sizeof(int));
 #define HAVE_WATCOM_ATOMICS
@@ -74,8 +74,8 @@ extern __inline int _SDL_xadd_watcom(volatile int *a, int v);
   value [eax] \
   modify exact [eax];
 
-#endif /* __WATCOMC__ && __386__ */
-/* *INDENT-ON* */ /* clang-format on */
+#endif // __WATCOMC__ && __386__
+/* *INDENT-ON* */ // clang-format on
 
 /*
   If any of the operations are not provided then we must emulate some
@@ -131,7 +131,7 @@ SDL_bool SDL_AtomicCompareAndSwap(SDL_AtomicInt *a, int oldval, int newval)
     return _SDL_cmpxchg_watcom(&a->value, newval, oldval);
 #elif defined(HAVE_GCC_ATOMICS)
     return __sync_bool_compare_and_swap(&a->value, oldval, newval);
-#elif defined(SDL_PLATFORM_MACOS) /* this is deprecated in 10.12 sdk; favor gcc atomics. */
+#elif defined(SDL_PLATFORM_MACOS) // this is deprecated in 10.12 sdk; favor gcc atomics.
     return OSAtomicCompareAndSwap32Barrier(oldval, newval, &a->value);
 #elif defined(SDL_PLATFORM_SOLARIS)
     return ((int)atomic_cas_uint((volatile uint_t *)&a->value, (uint_t)oldval, (uint_t)newval) == oldval);
@@ -159,9 +159,9 @@ SDL_bool SDL_AtomicCompareAndSwapPointer(void **a, void *oldval, void *newval)
     return _SDL_cmpxchg_watcom((int *)a, (long)newval, (long)oldval);
 #elif defined(HAVE_GCC_ATOMICS)
     return __sync_bool_compare_and_swap(a, oldval, newval);
-#elif defined(SDL_PLATFORM_MACOS) && defined(__LP64__)  /* this is deprecated in 10.12 sdk; favor gcc atomics. */
+#elif defined(SDL_PLATFORM_MACOS) && defined(__LP64__)  // this is deprecated in 10.12 sdk; favor gcc atomics.
     return OSAtomicCompareAndSwap64Barrier((int64_t)oldval, (int64_t)newval, (int64_t *)a);
-#elif defined(SDL_PLATFORM_MACOS) && !defined(__LP64__) /* this is deprecated in 10.12 sdk; favor gcc atomics. */
+#elif defined(SDL_PLATFORM_MACOS) && !defined(__LP64__) // this is deprecated in 10.12 sdk; favor gcc atomics.
     return OSAtomicCompareAndSwap32Barrier((int32_t)oldval, (int32_t)newval, (int32_t *)a);
 #elif defined(SDL_PLATFORM_SOLARIS)
     return (atomic_cas_ptr(a, oldval, newval) == oldval);
@@ -254,7 +254,7 @@ int SDL_AtomicGet(SDL_AtomicInt *a)
     return _SDL_xadd_watcom(&a->value, 0);
 #elif defined(HAVE_GCC_ATOMICS)
     return __sync_or_and_fetch(&a->value, 0);
-#elif defined(SDL_PLATFORM_MACOS) /* this is deprecated in 10.12 sdk; favor gcc atomics. */
+#elif defined(SDL_PLATFORM_MACOS) // this is deprecated in 10.12 sdk; favor gcc atomics.
     return sizeof(a->value) == sizeof(uint32_t) ? OSAtomicOr32Barrier(0, (volatile uint32_t *)&a->value) : OSAtomicAdd64Barrier(0, (volatile int64_t *)&a->value);
 #elif defined(SDL_PLATFORM_SOLARIS)
     return atomic_or_uint_nv((volatile uint_t *)&a->value, 0);

src/atomic/SDL_spinlock.c

@@ -44,7 +44,7 @@
 #include <libkern/OSAtomic.h>
 #endif
 
-/* *INDENT-OFF* */ /* clang-format off */
+/* *INDENT-OFF* */ // clang-format off
 #if defined(__WATCOMC__) && defined(__386__)
 SDL_COMPILE_TIME_ASSERT(locksize, 4==sizeof(SDL_SpinLock));
 extern __inline int _SDL_xchg_watcom(volatile int *a, int v);
@@ -53,10 +53,10 @@ extern __inline int _SDL_xchg_watcom(volatile int *a, int v);
   parm [ecx] [eax] \
   value [eax] \
   modify exact [eax];
-#endif /* __WATCOMC__ && __386__ */
-/* *INDENT-ON* */ /* clang-format on */
+#endif // __WATCOMC__ && __386__
+/* *INDENT-ON* */ // clang-format on
 
-/* This function is where all the magic happens... */
+// This function is where all the magic happens...
 SDL_bool SDL_TryLockSpinlock(SDL_SpinLock *lock)
 {
 #if defined(HAVE_GCC_ATOMICS) || defined(HAVE_GCC_SYNC_LOCK_TEST_AND_SET)
@@ -116,15 +116,15 @@ SDL_bool SDL_TryLockSpinlock(SDL_SpinLock *lock)
     return result == 0;
 
 #elif defined(SDL_PLATFORM_MACOS) || defined(SDL_PLATFORM_IOS) || defined(SDL_PLATFORM_TVOS)
-    /* Maybe used for PowerPC, but the Intel asm or gcc atomics are favored. */
+    // Maybe used for PowerPC, but the Intel asm or gcc atomics are favored.
     return OSAtomicCompareAndSwap32Barrier(0, 1, lock);
 
 #elif defined(SDL_PLATFORM_SOLARIS) && defined(_LP64)
-    /* Used for Solaris with non-gcc compilers. */
+    // Used for Solaris with non-gcc compilers.
     return ((int)atomic_cas_64((volatile uint64_t *)lock, 0, 1) == 0);
 
 #elif defined(SDL_PLATFORM_SOLARIS) && !defined(_LP64)
-    /* Used for Solaris with non-gcc compilers. */
+    // Used for Solaris with non-gcc compilers.
     return ((int)atomic_cas_32((volatile uint32_t *)lock, 0, 1) == 0);
 #elif defined(PS2)
     uint32_t oldintr;
@@ -142,11 +142,11 @@ SDL_bool SDL_TryLockSpinlock(SDL_SpinLock *lock)
     }
     return res;
 #else
-    /* Terrible terrible damage */
+    // Terrible terrible damage
     static SDL_Mutex *_spinlock_mutex;
 
     if (!_spinlock_mutex) {
-        /* Race condition on first lock... */
+        // Race condition on first lock...
         _spinlock_mutex = SDL_CreateMutex();
     }
     SDL_LockMutex(_spinlock_mutex);
@@ -164,13 +164,13 @@ SDL_bool SDL_TryLockSpinlock(SDL_SpinLock *lock)
 void SDL_LockSpinlock(SDL_SpinLock *lock)
 {
     int iterations = 0;
-    /* FIXME: Should we have an eventual timeout? */
+    // FIXME: Should we have an eventual timeout?
     while (!SDL_TryLockSpinlock(lock)) {
         if (iterations < 32) {
             iterations++;
             SDL_CPUPauseInstruction();
         } else {
-            /* !!! FIXME: this doesn't definitely give up the current timeslice, it does different things on various platforms. */
+            // !!! FIXME: this doesn't definitely give up the current timeslice, it does different things on various platforms.
             SDL_Delay(0);
         }
     }
@@ -193,7 +193,7 @@ void SDL_UnlockSpinlock(SDL_SpinLock *lock)
     *lock = 0;
 
 #elif defined(SDL_PLATFORM_SOLARIS)
-    /* Used for Solaris when not using gcc. */
+    // Used for Solaris when not using gcc.
     *lock = 0;
     membar_producer();
 

src/audio/SDL_audio.c

@@ -1722,7 +1722,7 @@ SDL_AudioDeviceID SDL_OpenAudioDevice(SDL_AudioDeviceID devid, const SDL_AudioSp
             // uhoh, this device is undead, and just waiting to be cleaned up. Refuse explicit opens.
             SDL_SetError("Device was already lost and can't accept new opens");
         } else if ((logdev = (SDL_LogicalAudioDevice *) SDL_calloc(1, sizeof (SDL_LogicalAudioDevice))) == NULL) {
-            /* SDL_calloc already called SDL_OutOfMemory */
+            // SDL_calloc already called SDL_OutOfMemory
         } else if (OpenPhysicalAudioDevice(device, spec) < 0) {  // if this is the first thing using this physical device, open at the OS level if necessary...
             SDL_free(logdev);
         } else {

src/audio/SDL_audio_c.h

@@ -24,4 +24,4 @@
 
 extern void SDL_UpdateAudio(void);
 
-#endif /* SDL_audio_c_h_ */
+#endif // SDL_audio_c_h_

src/audio/SDL_audio_channel_converters.h

@@ -1055,7 +1055,7 @@ static void SDL_Convert71To61(float *dst, const float *src, int num_frames)
 
 }
 
-static const SDL_AudioChannelConverter channel_converters[8][8] = {   /* [from][to] */
+static const SDL_AudioChannelConverter channel_converters[8][8] = {   // [from][to]
     { NULL, SDL_ConvertMonoToStereo, SDL_ConvertMonoTo21, SDL_ConvertMonoToQuad, SDL_ConvertMonoTo41, SDL_ConvertMonoTo51, SDL_ConvertMonoTo61, SDL_ConvertMonoTo71 },
     { SDL_ConvertStereoToMono, NULL, SDL_ConvertStereoTo21, SDL_ConvertStereoToQuad, SDL_ConvertStereoTo41, SDL_ConvertStereoTo51, SDL_ConvertStereoTo61, SDL_ConvertStereoTo71 },
     { SDL_Convert21ToMono, SDL_Convert21ToStereo, NULL, SDL_Convert21ToQuad, SDL_Convert21To41, SDL_Convert21To51, SDL_Convert21To61, SDL_Convert21To71 },

src/audio/SDL_wave.h

@@ -20,21 +20,21 @@
 */
 #include "SDL_internal.h"
 
-/* RIFF WAVE files are little-endian */
+// RIFF WAVE files are little-endian
 
 /*******************************************/
-/* Define values for Microsoft WAVE format */
+// Define values for Microsoft WAVE format
 /*******************************************/
-/* FOURCC */
-#define RIFF 0x46464952 /* "RIFF" */
-#define WAVE 0x45564157 /* "WAVE" */
-#define FACT 0x74636166 /* "fact" */
-#define LIST 0x5453494c /* "LIST" */
-#define BEXT 0x74786562 /* "bext" */
-#define JUNK 0x4B4E554A /* "JUNK" */
-#define FMT  0x20746D66 /* "fmt " */
-#define DATA 0x61746164 /* "data" */
-/* Format tags */
+// FOURCC
+#define RIFF 0x46464952 // "RIFF"
+#define WAVE 0x45564157 // "WAVE"
+#define FACT 0x74636166 // "fact"
+#define LIST 0x5453494c // "LIST"
+#define BEXT 0x74786562 // "bext"
+#define JUNK 0x4B4E554A // "JUNK"
+#define FMT  0x20746D66 // "fmt "
+#define DATA 0x61746164 // "data"
+// Format tags
 #define UNKNOWN_CODE    0x0000
 #define PCM_CODE        0x0001
 #define MS_ADPCM_CODE   0x0002
@@ -46,30 +46,30 @@
 #define MPEGLAYER3_CODE 0x0055
 #define EXTENSIBLE_CODE 0xFFFE
 
-/* Stores the WAVE format information. */
+// Stores the WAVE format information.
 typedef struct WaveFormat
 {
-    Uint16 formattag;     /* Raw value of the first field in the fmt chunk data. */
-    Uint16 encoding;      /* Actual encoding, possibly from the extensible header. */
-    Uint16 channels;      /* Number of channels. */
-    Uint32 frequency;     /* Sampling rate in Hz. */
-    Uint32 byterate;      /* Average bytes per second. */
-    Uint16 blockalign;    /* Bytes per block. */
-    Uint16 bitspersample; /* Currently supported are 8, 16, 24, 32, and 4 for ADPCM. */
+    Uint16 formattag;     // Raw value of the first field in the fmt chunk data.
+    Uint16 encoding;      // Actual encoding, possibly from the extensible header.
+    Uint16 channels;      // Number of channels.
+    Uint32 frequency;     // Sampling rate in Hz.
+    Uint32 byterate;      // Average bytes per second.
+    Uint16 blockalign;    // Bytes per block.
+    Uint16 bitspersample; // Currently supported are 8, 16, 24, 32, and 4 for ADPCM.
 
     /* Extra information size. Number of extra bytes starting at byte 18 in the
      * fmt chunk data. This is at least 22 for the extensible header.
      */
     Uint16 extsize;
 
-    /* Extensible WAVE header fields */
+    // Extensible WAVE header fields
     Uint16 validsamplebits;
-    Uint32 samplesperblock; /* For compressed formats. Can be zero. Actually 16 bits in the header. */
+    Uint32 samplesperblock; // For compressed formats. Can be zero. Actually 16 bits in the header.
     Uint32 channelmask;
-    Uint8 subformat[16]; /* A format GUID. */
+    Uint8 subformat[16]; // A format GUID.
 } WaveFormat;
 
-/* Stores information on the fact chunk. */
+// Stores information on the fact chunk.
 typedef struct WaveFact
 {
     /* Represents the state of the fact chunk in the WAVE file.
@@ -88,20 +88,20 @@ typedef struct WaveFact
      * because a compressed block is usually decoded to a fixed number of
      * sample frames.
      */
-    Uint32 samplelength; /* Raw sample length value from the fact chunk. */
+    Uint32 samplelength; // Raw sample length value from the fact chunk.
 } WaveFact;
 
-/* Generic struct for the chunks in the WAVE file. */
+// Generic struct for the chunks in the WAVE file.
 typedef struct WaveChunk
 {
-    Uint32 fourcc;   /* FOURCC of the chunk. */
-    Uint32 length;   /* Size of the chunk data. */
-    Sint64 position; /* Position of the data in the stream. */
-    Uint8 *data;     /* When allocated, this points to the chunk data. length is used for the memory allocation size. */
-    size_t size;     /* Number of bytes in data that could be read from the stream. Can be smaller than length. */
+    Uint32 fourcc;   // FOURCC of the chunk.
+    Uint32 length;   // Size of the chunk data.
+    Sint64 position; // Position of the data in the stream.
+    Uint8 *data;     // When allocated, this points to the chunk data. length is used for the memory allocation size.
+    size_t size;     // Number of bytes in data that could be read from the stream. Can be smaller than length.
 } WaveChunk;
 
-/* Controls how the size of the RIFF chunk affects the loading of a WAVE file. */
+// Controls how the size of the RIFF chunk affects the loading of a WAVE file.
 typedef enum WaveRiffSizeHint
 {
     RiffSizeNoHint,
@@ -111,7 +111,7 @@ typedef enum WaveRiffSizeHint
     RiffSizeMaximum
 } WaveRiffSizeHint;
 
-/* Controls how a truncated WAVE file is handled. */
+// Controls how a truncated WAVE file is handled.
 typedef enum WaveTruncationHint
 {
     TruncNoHint,
@@ -121,7 +121,7 @@ typedef enum WaveTruncationHint
     TruncDropBlock
 } WaveTruncationHint;
 
-/* Controls how the fact chunk affects the loading of a WAVE file. */
+// Controls how the fact chunk affects the loading of a WAVE file.
 typedef enum WaveFactChunkHint
 {
     FactNoHint,
@@ -143,7 +143,7 @@ typedef struct WaveFile
      */
     Sint64 sampleframes;
 
-    void *decoderdata; /* Some decoders require extra data for a state. */
+    void *decoderdata; // Some decoders require extra data for a state.
 
     WaveRiffSizeHint riffhint;
     WaveTruncationHint trunchint;

src/audio/coreaudio/SDL_coreaudio.m

@@ -883,7 +883,7 @@ static int COREAUDIO_OpenDevice(SDL_AudioDevice *device)
         }
         #else
         // Calling setPreferredOutputNumberOfChannels seems to break audio output on iOS
-        #endif /* SDL_PLATFORM_TVOS */
+        #endif // SDL_PLATFORM_TVOS
     }
     #endif
 

src/audio/emscripten/SDL_emscriptenaudio.c

@@ -29,7 +29,7 @@
 
 // just turn off clang-format for this whole file, this INDENT_OFF stuff on
 //  each EM_ASM section is ugly.
-/* *INDENT-OFF* */ /* clang-format off */
+/* *INDENT-OFF* */ // clang-format off
 
 static Uint8 *EMSCRIPTENAUDIO_GetDeviceBuf(SDL_AudioDevice *device, int *buffer_size)
 {
@@ -346,6 +346,6 @@ AudioBootStrap EMSCRIPTENAUDIO_bootstrap = {
     "emscripten", "SDL emscripten audio driver", EMSCRIPTENAUDIO_Init, SDL_FALSE
 };
 
-/* *INDENT-ON* */ /* clang-format on */
+/* *INDENT-ON* */ // clang-format on
 
 #endif // SDL_AUDIO_DRIVER_EMSCRIPTEN

src/audio/netbsd/SDL_netbsdaudio.c

@@ -47,7 +47,7 @@ static void NETBSDAUDIO_DetectDevices(SDL_AudioDevice **default_playback, SDL_Au
 static void NETBSDAUDIO_Status(SDL_AudioDevice *device)
 {
 #ifdef DEBUG_AUDIO
-    /* *INDENT-OFF* */ /* clang-format off */
+    /* *INDENT-OFF* */ // clang-format off
     audio_info_t info;
     const struct audio_prinfo *prinfo;
 
@@ -109,7 +109,7 @@ static void NETBSDAUDIO_Status(SDL_AudioDevice *device)
             "",
             device->spec.format,
             device->buffer_size);
-    /* *INDENT-ON* */ /* clang-format on */
+    /* *INDENT-ON* */ // clang-format on
 
 #endif // DEBUG_AUDIO
 }

src/audio/wasapi/SDL_wasapi.c

@@ -48,7 +48,7 @@ static const IID SDL_IID_IAudioRenderClient = { 0xf294acfc, 0x3146, 0x4483, { 0x
 static const IID SDL_IID_IAudioCaptureClient = { 0xc8adbd64, 0xe71e, 0x48a0, { 0xa4, 0xde, 0x18, 0x5c, 0x39, 0x5c, 0xd3, 0x17 } };
 #ifdef __IAudioClient3_INTERFACE_DEFINED__
 static const IID SDL_IID_IAudioClient3 = { 0x7ed4ee07, 0x8e67, 0x4cd4, { 0x8c, 0x1a, 0x2b, 0x7a, 0x59, 0x87, 0xad, 0x42 } };
-#endif /**/
+#endif //
 
 
 // WASAPI is _really_ particular about various things happening on the same thread, for COM and such,

src/camera/emscripten/SDL_camera_emscripten.c

@@ -30,7 +30,7 @@
 
 // just turn off clang-format for this whole file, this INDENT_OFF stuff on
 //  each EM_ASM section is ugly.
-/* *INDENT-OFF* */ /* clang-format off */
+/* *INDENT-OFF* */ // clang-format off
 
 EM_JS_DEPS(sdlcamera, "$dynCall");
 
@@ -261,7 +261,7 @@ CameraBootStrap EMSCRIPTENCAMERA_bootstrap = {
     "emscripten", "SDL Emscripten MediaStream camera driver", EMSCRIPTENCAMERA_Init, SDL_FALSE
 };
 
-/* *INDENT-ON* */ /* clang-format on */
+/* *INDENT-ON* */ // clang-format on
 
 #endif // SDL_CAMERA_DRIVER_EMSCRIPTEN
 

src/camera/mediafoundation/SDL_camera_mediafoundation.c

@@ -449,7 +449,7 @@ static int MEDIAFOUNDATION_AcquireFrame(SDL_Camera *device, SDL_Surface *frame,
         *timestampNS = timestamp100NS * 100;  // the timestamps are in 100-nanosecond increments; move to full nanoseconds.
     }
 
-    ret = (retval < 0) ? E_FAIL : IMFSample_ConvertToContiguousBuffer(objs->sample, &objs->buffer);  /*IMFSample_GetBufferByIndex(objs->sample, 0, &objs->buffer);*/
+    ret = (retval < 0) ? E_FAIL : IMFSample_ConvertToContiguousBuffer(objs->sample, &objs->buffer);  // IMFSample_GetBufferByIndex(objs->sample, 0, &objs->buffer);
 
     if (FAILED(ret)) {
         SDL_free(objs);
@@ -546,7 +546,7 @@ static int MEDIAFOUNDATION_AcquireFrame(SDL_Camera *device, SDL_Surface *frame,
     }
 
     IMFMediaBuffer *buffer = NULL;
-    ret = (retval < 0) ? E_FAIL : IMFSample_ConvertToContiguousBuffer(sample, &buffer); /*IMFSample_GetBufferByIndex(sample, 0, &buffer);*/
+    ret = (retval < 0) ? E_FAIL : IMFSample_ConvertToContiguousBuffer(sample, &buffer); // IMFSample_GetBufferByIndex(sample, 0, &buffer);
 
     if (FAILED(ret)) {
         retval = -1;
@@ -660,7 +660,7 @@ static HRESULT GetDefaultStride(IMFMediaType *pType, LONG *plStride)
 
         GUID subtype = GUID_NULL;
         UINT32 width = 0;
-        /* UINT32 height = 0; */
+        // UINT32 height = 0;
         UINT64 val = 0;
 
         // Get the subtype and the image size.
@@ -675,7 +675,7 @@ static HRESULT GetDefaultStride(IMFMediaType *pType, LONG *plStride)
         }
 
         width = (UINT32) (val >> 32);
-        /* height = (UINT32) val; */
+        // height = (UINT32) val;
 
         ret = pMFGetStrideForBitmapInfoHeader(subtype.Data1, width, &lStride);
         if (FAILED(ret)) {

src/core/SDL_core_unsupported.c

@@ -77,7 +77,7 @@ int SDL_RegisterApp(const char *name, Uint32 style, void *hInst)
     return SDL_Unsupported();
 }
 
-SDL_DECLSPEC void SDLCALL SDL_SetWindowsMessageHook(void *callback, void *userdata); /* SDL_WindowsMessageHook callback */
+SDL_DECLSPEC void SDLCALL SDL_SetWindowsMessageHook(void *callback, void *userdata); // SDL_WindowsMessageHook callback
 void SDL_SetWindowsMessageHook(void *callback, void *userdata)
 {
     (void)callback;
@@ -95,15 +95,15 @@ void SDL_UnregisterApp(void)
 
 #ifndef SDL_PLATFORM_WINRT
 
-/* Returns SDL_WinRT_DeviceFamily enum */
+// Returns SDL_WinRT_DeviceFamily enum
 SDL_DECLSPEC int SDLCALL SDL_GetWinRTDeviceFamily(void);
 int SDL_GetWinRTDeviceFamily(void)
 {
     SDL_Unsupported();
-    return 0; /* SDL_WINRT_DEVICEFAMILY_UNKNOWN */
+    return 0; // SDL_WINRT_DEVICEFAMILY_UNKNOWN
 }
 
-SDL_DECLSPEC const char *SDLCALL SDL_GetWinRTFSPath(int pathType); /* SDL_WinRT_Path pathType */
+SDL_DECLSPEC const char *SDLCALL SDL_GetWinRTFSPath(int pathType); // SDL_WinRT_Path pathType
 const char *SDL_GetWinRTFSPath(int pathType)
 {
     (void)pathType;
@@ -224,6 +224,6 @@ Sint32 JNI_OnLoad(void *vm, void *reserved)
     (void)vm;
     (void)reserved;
     SDL_Unsupported();
-    return -1; /* JNI_ERR */
+    return -1; // JNI_ERR
 }
 #endif

src/core/android/SDL_android.h

@@ -23,7 +23,7 @@
 #ifndef SDL_android_h
 #define SDL_android_h
 
-/* Set up for C function definitions, even when using C++ */
+// Set up for C function definitions, even when using C++
 #ifdef __cplusplus
 /* *INDENT-OFF* */
 extern "C" {
@@ -38,7 +38,7 @@ extern "C" {
 // this appears to be broken right now (on Android, not SDL, I think...?).
 #define ALLOW_MULTIPLE_ANDROID_AUDIO_DEVICES 0
 
-/* Life cycle */
+// Life cycle
 typedef enum
 {
     SDL_ANDROID_LIFECYCLE_WAKE,
@@ -55,7 +55,7 @@ SDL_bool Android_WaitLifecycleEvent(SDL_AndroidLifecycleEvent *event, Sint64 tim
 void Android_LockActivityMutex(void);
 void Android_UnlockActivityMutex(void);
 
-/* Interface from the SDL library into the Android Java activity */
+// Interface from the SDL library into the Android Java activity
 extern void Android_JNI_SetActivityTitle(const char *title);
 extern void Android_JNI_SetWindowStyle(SDL_bool fullscreen);
 extern void Android_JNI_SetOrientation(int w, int h, int resizable, const char *hint);
@@ -71,12 +71,12 @@ extern ANativeWindow *Android_JNI_GetNativeWindow(void);
 extern SDL_DisplayOrientation Android_JNI_GetDisplayNaturalOrientation(void);
 extern SDL_DisplayOrientation Android_JNI_GetDisplayCurrentOrientation(void);
 
-/* Audio support */
+// Audio support
 void Android_StartAudioHotplug(SDL_AudioDevice **default_playback, SDL_AudioDevice **default_recording);
 void Android_StopAudioHotplug(void);
 extern void Android_AudioThreadInit(SDL_AudioDevice *device);
 
-/* Detecting device type */
+// Detecting device type
 extern SDL_bool Android_IsDeXMode(void);
 extern SDL_bool Android_IsChromebook(void);
 
@@ -87,58 +87,58 @@ size_t Android_JNI_FileRead(void *userdata, void *buffer, size_t size, SDL_IOSta
 size_t Android_JNI_FileWrite(void *userdata, const void *buffer, size_t size, SDL_IOStatus *status);
 int Android_JNI_FileClose(void *userdata);
 
-/* Environment support */
+// Environment support
 void Android_JNI_GetManifestEnvironmentVariables(void);
 int Android_JNI_OpenFileDescriptor(const char *uri, const char *mode);
 
-/* Clipboard support */
+// Clipboard support
 int Android_JNI_SetClipboardText(const char *text);
 char *Android_JNI_GetClipboardText(void);
 SDL_bool Android_JNI_HasClipboardText(void);
 
-/* Power support */
+// Power support
 int Android_JNI_GetPowerInfo(int *plugged, int *charged, int *battery, int *seconds, int *percent);
 
-/* Joystick support */
+// Joystick support
 void Android_JNI_PollInputDevices(void);
 
-/* Haptic support */
+// Haptic support
 void Android_JNI_PollHapticDevices(void);
 void Android_JNI_HapticRun(int device_id, float intensity, int length);
 void Android_JNI_HapticRumble(int device_id, float low_frequency_intensity, float high_frequency_intensity, int length);
 void Android_JNI_HapticStop(int device_id);
 
-/* Video */
+// Video
 int Android_JNI_SuspendScreenSaver(SDL_bool suspend);
 
-/* Touch support */
+// Touch support
 void Android_JNI_InitTouch(void);
 
-/* Threads */
+// Threads
 #include <jni.h>
 JNIEnv *Android_JNI_GetEnv(void);
 int Android_JNI_SetupThread(void);
 
-/* Locale */
+// Locale
 int Android_JNI_GetLocale(char *buf, size_t buflen);
 
-/* Generic messages */
+// Generic messages
 int Android_JNI_SendMessage(int command, int param);
 
-/* MessageBox */
+// MessageBox
 int Android_JNI_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonID);
 
-/* Cursor support */
+// Cursor support
 int Android_JNI_CreateCustomCursor(SDL_Surface *surface, int hot_x, int hot_y);
 void Android_JNI_DestroyCustomCursor(int cursorID);
 SDL_bool Android_JNI_SetCustomCursor(int cursorID);
 SDL_bool Android_JNI_SetSystemCursor(int cursorID);
 
-/* Relative mouse support */
+// Relative mouse support
 SDL_bool Android_JNI_SupportsRelativeMouse(void);
 SDL_bool Android_JNI_SetRelativeMouseEnabled(SDL_bool enabled);
 
-/* Show toast notification */
+// Show toast notification
 int Android_JNI_ShowToast(const char *message, int duration, int gravity, int xOffset, int yOffset);
 
 int Android_JNI_OpenURL(const char *url);
@@ -150,12 +150,12 @@ SDL_bool SDL_IsAndroidTV(void);
 SDL_bool SDL_IsChromebook(void);
 SDL_bool SDL_IsDeXMode(void);
 
-/* File Dialogs */
+// File Dialogs
 SDL_bool Android_JNI_OpenFileDialog(SDL_DialogFileCallback callback, void* userdata,
     const SDL_DialogFileFilter *filters, int nfilters, SDL_bool forwrite,
     SDL_bool multiple);
 
-/* Ends C function definitions when using C++ */
+// Ends C function definitions when using C++
 #ifdef __cplusplus
 /* *INDENT-OFF* */
 }

src/core/freebsd/SDL_evdev_kbd_default_keyaccmap.h

@@ -1,6 +1,6 @@
 #include <sys/kbio.h>
 
-/* *INDENT-OFF* */ /* clang-format off */
+/* *INDENT-OFF* */ // clang-format off
 /*
  * Automatically generated from /usr/share/vt/keymaps/us.acc.kbd.
  * DO NOT EDIT!
@@ -123,45 +123,45 @@ static keymap_t keymap_default_us_acc = { 0x6d, {
 } };
 
 static accentmap_t accentmap_default_us_acc = { 11, {
-    /* dgra=0 */
+    // dgra=0
     {  '`', { {  'a',0xe0 }, {  'A',0xc0 }, {  'e',0xe8 }, {  'E',0xc8 },
 	      {  'i',0xec }, {  'I',0xcc }, {  'o',0xf2 }, {  'O',0xd2 },
 	      {  'u',0xf9 }, {  'U',0xd9 }, }, },
-    /* dacu=1 */
+    // dacu=1
     { 0xb4, { {  'a',0xe1 }, {  'A',0xc1 }, {  'e',0xe9 }, {  'E',0xc9 },
 	      {  'i',0xed }, {  'I',0xcd }, {  'o',0xf3 }, {  'O',0xd3 },
 	      {  'u',0xfa }, {  'U',0xda }, {  'y',0xfd }, {  'Y',0xdd }, }, },
-    /* dcir=2 */
+    // dcir=2
     {  '^', { {  'a',0xe2 }, {  'A',0xc2 }, {  'e',0xea }, {  'E',0xca },
 	      {  'i',0xee }, {  'I',0xce }, {  'o',0xf4 }, {  'O',0xd4 },
 	      {  'u',0xfb }, {  'U',0xdb }, }, },
-    /* dtil=3 */
+    // dtil=3
     {  '~', { {  'a',0xe3 }, {  'A',0xc3 }, {  'n',0xf1 }, {  'N',0xd1 },
 	      {  'o',0xf5 }, {  'O',0xd5 }, }, },
-    /* dmac=4 */
-    { 0x00 }, 
-    /* dbre=5 */
-    { 0x00 }, 
-    /* ddot=6 */
-    { 0x00 }, 
-    /* duml=7 */
+    // dmac=4
+    { 0x00 },
+    // dbre=5
+    { 0x00 },
+    // ddot=6
+    { 0x00 },
+    // duml=7
     { 0xa8, { {  'a',0xe4 }, {  'A',0xc4 }, {  'e',0xeb }, {  'E',0xcb },
 	      {  'i',0xef }, {  'I',0xcf }, {  'o',0xf6 }, {  'O',0xd6 },
 	      {  'u',0xfc }, {  'U',0xdc }, {  'y',0xff }, }, },
-    /* dsla=8 */
-    { 0x00 }, 
-    /* drin=9 */
+    // dsla=8
+    { 0x00 },
+    // drin=9
     { 0xb0, { {  'a',0xe5 }, {  'A',0xc5 }, }, },
-    /* dced=10 */
+    // dced=10
     { 0xb8, { {  'c',0xe7 }, {  'C',0xc7 }, }, },
-    /* dapo=11 */
-    { 0x00 }, 
-    /* ddac=12 */
-    { 0x00 }, 
-    /* dogo=13 */
-    { 0x00 }, 
-    /* dcar=14 */
-    { 0x00 }, 
+    // dapo=11
+    { 0x00 },
+    // ddac=12
+    { 0x00 },
+    // dogo=13
+    { 0x00 },
+    // dcar=14
+    { 0x00 },
 } };
 
-/* *INDENT-ON* */ /* clang-format on */
+/* *INDENT-ON* */ // clang-format on

src/core/freebsd/SDL_evdev_kbd_freebsd.c

@@ -25,7 +25,7 @@
 
 #ifdef SDL_INPUT_FBSDKBIO
 
-/* This logic is adapted from drivers/tty/vt/keyboard.c in the Linux kernel source, slightly modified to work with FreeBSD */
+// This logic is adapted from drivers/tty/vt/keyboard.c in the Linux kernel source, slightly modified to work with FreeBSD
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -52,12 +52,12 @@ struct SDL_EVDEV_keyboard_state
     unsigned short **key_maps;
     keymap_t *key_map;
     keyboard_info_t *kbInfo;
-    unsigned char shift_down[4]; /* shift state counters.. */
+    unsigned char shift_down[4]; // shift state counters..
     SDL_bool dead_key_next;
-    int npadch; /* -1 or number assembled on pad */
+    int npadch; // -1 or number assembled on pad
     accentmap_t *accents;
     unsigned int diacr;
-    SDL_bool rep; /* flag telling character repeat */
+    SDL_bool rep; // flag telling character repeat
     unsigned char lockstate;
     unsigned char ledflagstate;
     char shift_state;
@@ -77,7 +77,7 @@ static int kbd_cleanup_atexit_installed = 0;
 static struct sigaction old_sigaction[NSIG];
 
 static int fatal_signals[] = {
-    /* Handlers for SIGTERM and SIGINT are installed in SDL_InitQuit. */
+    // Handlers for SIGTERM and SIGINT are installed in SDL_InitQuit.
     SIGHUP, SIGQUIT, SIGILL, SIGABRT,
     SIGFPE, SIGSEGV, SIGPIPE, SIGBUS,
     SIGSYS
@@ -114,22 +114,22 @@ static void kbd_cleanup_signal_action(int signum, siginfo_t *info, void *ucontex
     struct sigaction *old_action_p = &(old_sigaction[signum]);
     sigset_t sigset;
 
-    /* Restore original signal handler before going any further. */
+    // Restore original signal handler before going any further.
     sigaction(signum, old_action_p, NULL);
 
-    /* Unmask current signal. */
+    // Unmask current signal.
     sigemptyset(&sigset);
     sigaddset(&sigset, signum);
     sigprocmask(SIG_UNBLOCK, &sigset, NULL);
 
-    /* Save original signal info and context for archeologists. */
+    // Save original signal info and context for archeologists.
     SDL_EVDEV_kdb_cleanup_siginfo = info;
     SDL_EVDEV_kdb_cleanup_ucontext = ucontext;
 
-    /* Restore keyboard. */
+    // Restore keyboard.
     kbd_cleanup();
 
-    /* Reraise signal. */
+    // Reraise signal.
     SDL_EVDEV_kbd_reraise_signal(signum);
 }
 
@@ -150,27 +150,27 @@ static void kbd_unregister_emerg_cleanup(void)
         int signum = fatal_signals[tabidx];
         old_action_p = &(old_sigaction[signum]);
 
-        /* Examine current signal action */
+        // Examine current signal action
         if (sigaction(signum, NULL, &cur_action)) {
             continue;
         }
 
-        /* Check if action installed and not modified */
+        // Check if action installed and not modified
         if (!(cur_action.sa_flags & SA_SIGINFO) || cur_action.sa_sigaction != &kbd_cleanup_signal_action) {
             continue;
         }
 
-        /* Restore original action */
+        // Restore original action
         sigaction(signum, old_action_p, NULL);
     }
 }
 
 static void kbd_cleanup_atexit(void)
 {
-    /* Restore keyboard. */
+    // Restore keyboard.
     kbd_cleanup();
 
-    /* Try to restore signal handlers in case shared library is being unloaded */
+    // Try to restore signal handlers in case shared library is being unloaded
     kbd_unregister_emerg_cleanup();
 }
 
@@ -236,7 +236,7 @@ SDL_EVDEV_keyboard_state *SDL_EVDEV_kbd_init(void)
 
     kbd->npadch = -1;
 
-    /* This might fail if we're not connected to a tty (e.g. on the Steam Link) */
+    // This might fail if we're not connected to a tty (e.g. on the Steam Link)
     kbd->keyboard_fd = kbd->console_fd = open("/dev/tty", O_RDONLY | O_CLOEXEC);
 
     kbd->shift_state = 0;
@@ -258,7 +258,7 @@ SDL_EVDEV_keyboard_state *SDL_EVDEV_kbd_init(void)
     }
 
     if (ioctl(kbd->console_fd, KDGKBMODE, &kbd->old_kbd_mode) == 0) {
-        /* Set the keyboard in XLATE mode and load the keymaps */
+        // Set the keyboard in XLATE mode and load the keymaps
         ioctl(kbd->console_fd, KDSKBMODE, (unsigned long)(K_XLATE));
         if (!SDL_EVDEV_kbd_load_keymaps(kbd)) {
             SDL_free(kbd->key_map);
@@ -306,7 +306,7 @@ void SDL_EVDEV_kbd_quit(SDL_EVDEV_keyboard_state *kbd)
     kbd_unregister_emerg_cleanup();
 
     if (kbd->keyboard_fd >= 0) {
-        /* Restore the original keyboard mode */
+        // Restore the original keyboard mode
         ioctl(kbd->keyboard_fd, KDSKBMODE, kbd->old_kbd_mode);
 
         close(kbd->keyboard_fd);
@@ -337,7 +337,7 @@ void SDL_EVDEV_kbd_update(SDL_EVDEV_keyboard_state *state)
  */
 static void put_queue(SDL_EVDEV_keyboard_state *kbd, uint c)
 {
-    /* c is already part of a UTF-8 sequence and safe to add as a character */
+    // c is already part of a UTF-8 sequence and safe to add as a character
     if (kbd->text_len < (sizeof(kbd->text) - 1)) {
         kbd->text[kbd->text_len++] = (char)c;
     }
@@ -389,7 +389,7 @@ static unsigned int handle_diacr(SDL_EVDEV_keyboard_state *kbd, unsigned int ch)
     for (i = 0; i < kbd->accents->n_accs; i++) {
         if (kbd->accents->acc[i].accchar == d) {
             for (j = 0; j < NUM_ACCENTCHARS; ++j) {
-                if (kbd->accents->acc[i].map[j][0] == 0) { /* end of table */
+                if (kbd->accents->acc[i].map[j][0] == 0) { // end of table
                     break;
                 }
                 if (kbd->accents->acc[i].map[j][0] == ch) {
@@ -426,7 +426,7 @@ static void chg_vc_kbd_led(SDL_EVDEV_keyboard_state *kbd, int flag)
 static void k_self(SDL_EVDEV_keyboard_state *kbd, unsigned int value, char up_flag)
 {
     if (up_flag) {
-        return; /* no action, if this is a key release */
+        return; // no action, if this is a key release
     }
 
     if (kbd->diacr) {
@@ -472,7 +472,7 @@ static void k_shift(SDL_EVDEV_keyboard_state *kbd, unsigned char value, char up_
     else
         kbd->shift_state &= ~(1 << value);
 
-    /* kludge */
+    // kludge
     if (up_flag && kbd->shift_state != old_state && kbd->npadch != -1) {
         put_utf8(kbd, kbd->npadch);
         kbd->npadch = -1;
@@ -496,7 +496,7 @@ void SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *kbd, unsigned int keycode,
 
     if (keycode < NUM_KEYS) {
         if (keycode >= 89 && keycode <= 95) {
-            /* These constitute unprintable language-related keys, so ignore them. */
+            // These constitute unprintable language-related keys, so ignore them.
             return;
         }
         if (keycode > 95) {
@@ -520,69 +520,69 @@ void SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *kbd, unsigned int keycode,
 
     map_from_key_sym = keysym.map[final_key_state];
     if ((keysym.spcl & (0x80 >> final_key_state)) || (map_from_key_sym & SPCLKEY)) {
-        /* Special function.*/
+        // Special function.
         if (map_from_key_sym == 0)
-            return; /* Nothing to do. */
+            return; // Nothing to do.
         if (map_from_key_sym & SPCLKEY) {
             map_from_key_sym &= ~SPCLKEY;
         }
         if (map_from_key_sym >= F_ACC && map_from_key_sym <= L_ACC) {
-            /* Accent function.*/
+            // Accent function.
             unsigned int accent_index = map_from_key_sym - F_ACC;
             if (kbd->accents->acc[accent_index].accchar != 0) {
                 k_deadunicode(kbd, kbd->accents->acc[accent_index].accchar, !down);
             }
         } else {
             switch (map_from_key_sym) {
-            case ASH: /* alt/meta shift */
+            case ASH: // alt/meta shift
                 k_shift(kbd, 3, down == 0);
                 break;
-            case LSHA: /* left shift + alt lock */
-            case RSHA: /* right shift + alt lock */
+            case LSHA: // left shift + alt lock
+            case RSHA: // right shift + alt lock
                 if (down == 0) {
                     chg_vc_kbd_led(kbd, ALKED);
                 }
                 SDL_FALLTHROUGH;
-            case LSH: /* left shift */
-            case RSH: /* right shift */
+            case LSH: // left shift
+            case RSH: // right shift
                 k_shift(kbd, 0, down == 0);
                 break;
-            case LCTRA: /* left ctrl + alt lock */
-            case RCTRA: /* right ctrl + alt lock */
+            case LCTRA: // left ctrl + alt lock
+            case RCTRA: // right ctrl + alt lock
                 if (down == 0) {
                     chg_vc_kbd_led(kbd, ALKED);
                 }
                 SDL_FALLTHROUGH;
-            case LCTR: /* left ctrl */
-            case RCTR: /* right ctrl */
+            case LCTR: // left ctrl
+            case RCTR: // right ctrl
                 k_shift(kbd, 1, down == 0);
                 break;
-            case LALTA: /* left alt + alt lock */
-            case RALTA: /* right alt + alt lock */
+            case LALTA: // left alt + alt lock
+            case RALTA: // right alt + alt lock
                 if (down == 0) {
                     chg_vc_kbd_led(kbd, ALKED);
                 }
                 SDL_FALLTHROUGH;
-            case LALT: /* left alt */
-            case RALT: /* right alt */
+            case LALT: // left alt
+            case RALT: // right alt
                 k_shift(kbd, 2, down == 0);
                 break;
-            case ALK: /* alt lock */
+            case ALK: // alt lock
                 if (down == 1) {
                     chg_vc_kbd_led(kbd, ALKED);
                 }
                 break;
-            case CLK: /* caps lock*/
+            case CLK: // caps lock
                 if (down == 1) {
                     chg_vc_kbd_led(kbd, CLKED);
                 }
                 break;
-            case NLK: /* num lock */
+            case NLK: // num lock
                 if (down == 1) {
                     chg_vc_kbd_led(kbd, NLKED);
                 }
                 break;
-            case SLK: /* scroll lock */
+            case SLK: // scroll lock
                 if (down == 1) {
                     chg_vc_kbd_led(kbd, SLKED);
                 }
@@ -610,4 +610,4 @@ void SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *kbd, unsigned int keycode,
     }
 }
 
-#endif /* SDL_INPUT_FBSDKBIO */
+#endif // SDL_INPUT_FBSDKBIO

src/core/gdk/SDL_gdk.cpp

@@ -37,7 +37,7 @@ HANDLE plmSuspendComplete = nullptr;
 extern "C"
 int SDL_GetGDKTaskQueue(XTaskQueueHandle *outTaskQueue)
 {
-    /* If this is the first call, first create the global task queue. */
+    // If this is the first call, first create the global task queue.
     if (!GDK_GlobalTaskQueue) {
         HRESULT hr;
 
@@ -48,10 +48,10 @@ int SDL_GetGDKTaskQueue(XTaskQueueHandle *outTaskQueue)
             return SDL_SetError("[GDK] Could not create global task queue");
         }
 
-        /* The initial call gets the non-duplicated handle so they can clean it up */
+        // The initial call gets the non-duplicated handle so they can clean it up
         *outTaskQueue = GDK_GlobalTaskQueue;
     } else {
-        /* Duplicate the global task queue handle into outTaskQueue */
+        // Duplicate the global task queue handle into outTaskQueue
         if (FAILED(XTaskQueueDuplicateHandle(GDK_GlobalTaskQueue, outTaskQueue))) {
             return SDL_SetError("[GDK] Unable to acquire global task queue");
         }
@@ -67,7 +67,7 @@ void GDK_DispatchTaskQueue(void)
      * This gives the option to opt-out for those who want to handle everything themselves.
      */
     if (GDK_GlobalTaskQueue) {
-        /* Dispatch any callbacks which are ready. */
+        // Dispatch any callbacks which are ready.
         while (XTaskQueueDispatch(GDK_GlobalTaskQueue, XTaskQueuePort::Completion, 0))
             ;
     }
@@ -76,7 +76,7 @@ void GDK_DispatchTaskQueue(void)
 extern "C"
 int GDK_RegisterChangeNotifications(void)
 {
-    /* Register suspend/resume handling */
+    // Register suspend/resume handling
     plmSuspendComplete = CreateEventEx(nullptr, nullptr, 0, EVENT_MODIFY_STATE | SYNCHRONIZE);
     if (!plmSuspendComplete) {
         SDL_SetError("[GDK] Unable to create plmSuspendComplete event");
@@ -102,7 +102,7 @@ int GDK_RegisterChangeNotifications(void)
         return -1;
     }
 
-    /* Register constrain/unconstrain handling */
+    // Register constrain/unconstrain handling
     auto raccn = [](BOOLEAN constrained, PVOID context) {
         SDL_LogDebug(SDL_LOG_CATEGORY_APPLICATION, "[GDK] in RegisterAppConstrainedChangeNotification handler");
         SDL_VideoDevice *_this = SDL_GetVideoDevice();
@@ -125,11 +125,11 @@ int GDK_RegisterChangeNotifications(void)
 extern "C"
 void GDK_UnregisterChangeNotifications(void)
 {
-    /* Unregister suspend/resume handling */
+    // Unregister suspend/resume handling
     UnregisterAppStateChangeNotification(hPLM);
     CloseHandle(plmSuspendComplete);
 
-    /* Unregister constrain/unconstrain handling */
+    // Unregister constrain/unconstrain handling
     UnregisterAppConstrainedChangeNotification(hCPLM);
 }
 

src/core/gdk/SDL_gdk.h

@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-/* This is called from WIN_PumpEvents on GDK */
+// This is called from WIN_PumpEvents on GDK
 extern void GDK_DispatchTaskQueue(void);
 
 extern int GDK_RegisterChangeNotifications(void);

src/core/haiku/SDL_BApp.h

@@ -36,7 +36,7 @@ extern "C" {
 
 #include "SDL_internal.h"
 
-/* Local includes */
+// Local includes
 #include "../../events/SDL_events_c.h"
 #include "../../video/haiku/SDL_bframebuffer.h"
 
@@ -47,27 +47,27 @@ extern "C" {
 #include <vector>
 
 
-/* Forward declarations */
+// Forward declarations
 class SDL_BLooper;
 class SDL_BWin;
 
-/* Message constants */
+// Message constants
 enum ToSDL
 {
-    /* Intercepted by BWindow on its way to BView */
+    // Intercepted by BWindow on its way to BView
     BAPP_MOUSE_MOVED,
     BAPP_MOUSE_BUTTON,
     BAPP_MOUSE_WHEEL,
     BAPP_KEY,
-    BAPP_REPAINT, /* from _UPDATE_ */
-    /* From BWindow */
-    BAPP_MAXIMIZE, /* from B_ZOOM */
+    BAPP_REPAINT, // from _UPDATE_
+    // From BWindow
+    BAPP_MAXIMIZE, // from B_ZOOM
     BAPP_MINIMIZE,
-    BAPP_RESTORE, /* TODO: IMPLEMENT! */
+    BAPP_RESTORE, // TODO: IMPLEMENT!
     BAPP_SHOW,
     BAPP_HIDE,
-    BAPP_MOUSE_FOCUS,    /* caused by MOUSE_MOVE */
-    BAPP_KEYBOARD_FOCUS, /* from WINDOW_ACTIVATED */
+    BAPP_MOUSE_FOCUS,    // caused by MOUSE_MOVE
+    BAPP_KEYBOARD_FOCUS, // from WINDOW_ACTIVATED
     BAPP_WINDOW_CLOSE_REQUESTED,
     BAPP_WINDOW_MOVED,
     BAPP_WINDOW_RESIZED,
@@ -78,7 +78,7 @@ enum ToSDL
 extern "C" SDL_BLooper *SDL_Looper;
 
 
-/* Create a descendant of BLooper */
+// Create a descendant of BLooper
 class SDL_BLooper : public BLooper
 {
   public:
@@ -93,10 +93,10 @@ class SDL_BLooper : public BLooper
     {
     }
 
-    /* Event-handling functions */
+    // Event-handling functions
     virtual void MessageReceived(BMessage *message)
     {
-        /* Sort out SDL-related messages */
+        // Sort out SDL-related messages
         switch (message->what) {
         case BAPP_MOUSE_MOVED:
             _HandleMouseMove(message);
@@ -159,7 +159,7 @@ class SDL_BLooper : public BLooper
             break;
 
         case BAPP_SCREEN_CHANGED:
-            /* TODO: Handle screen resize or workspace change */
+            // TODO: Handle screen resize or workspace change
             break;
 
         default:
@@ -168,7 +168,7 @@ class SDL_BLooper : public BLooper
         }
     }
 
-    /* Window creation/destruction methods */
+    // Window creation/destruction methods
     int32 GetID(SDL_Window *win)
     {
         int32 i;
@@ -179,19 +179,19 @@ class SDL_BLooper : public BLooper
             }
         }
 
-        /* Expand the vector if all slots are full */
+        // Expand the vector if all slots are full
         if (i == _GetNumWindowSlots()) {
             _PushBackWindow(win);
             return i;
         }
 
-        /* TODO: error handling */
+        // TODO: error handling
         return 0;
     }
 
     /* FIXME: Bad coding practice, but I can't include SDL_BWin.h here.  Is
        there another way to do this? */
-    void ClearID(SDL_BWin *bwin); /* Defined in SDL_BeApp.cc */
+    void ClearID(SDL_BWin *bwin); // Defined in SDL_BeApp.cc
 
     SDL_Window *GetSDLWindow(int32 winID)
     {
@@ -215,7 +215,7 @@ class SDL_BLooper : public BLooper
 #endif
 
   private:
-    /* Event management */
+    // Event management
     void _HandleBasicWindowEvent(BMessage *msg, SDL_EventType sdlEventType)
     {
         SDL_Window *win;
@@ -235,8 +235,8 @@ class SDL_BLooper : public BLooper
         int32 x = 0, y = 0;
         if (
             !_GetWinID(msg, &winID) ||
-            msg->FindInt32("x", &x) != B_OK || /* x movement */
-            msg->FindInt32("y", &y) != B_OK    /* y movement */
+            msg->FindInt32("x", &x) != B_OK || // x movement
+            msg->FindInt32("y", &y) != B_OK    // y movement
         ) {
             return;
         }
@@ -264,7 +264,7 @@ class SDL_BLooper : public BLooper
     {
         SDL_Window *win;
         int32 winID;
-        int32 button, state; /* left/middle/right, pressed/released */
+        int32 button, state; // left/middle/right, pressed/released
         if (
             !_GetWinID(msg, &winID) ||
             msg->FindInt32("button-id", &button) != B_OK ||
@@ -294,7 +294,7 @@ class SDL_BLooper : public BLooper
     {
         SDL_Window *win;
         int32 winID;
-        int32 scancode, state; /* scancode, pressed/released */
+        int32 scancode, state; // scancode, pressed/released
         if (
             !_GetWinID(msg, &winID) ||
             msg->FindInt32("key-state", &state) != B_OK ||
@@ -321,7 +321,7 @@ class SDL_BLooper : public BLooper
     {
         SDL_Window *win;
         int32 winID;
-        bool bSetFocus; /* If false, lose focus */
+        bool bSetFocus; // If false, lose focus
         if (
             !_GetWinID(msg, &winID) ||
             msg->FindBool("focusGained", &bSetFocus) != B_OK) {
@@ -331,7 +331,7 @@ class SDL_BLooper : public BLooper
         if (bSetFocus) {
             SDL_SetMouseFocus(win);
         } else if (SDL_GetMouseFocus() == win) {
-            /* Only lose all focus if this window was the current focus */
+            // Only lose all focus if this window was the current focus
             SDL_SetMouseFocus(NULL);
         }
     }
@@ -340,7 +340,7 @@ class SDL_BLooper : public BLooper
     {
         SDL_Window *win;
         int32 winID;
-        bool bSetFocus; /* If false, lose focus */
+        bool bSetFocus; // If false, lose focus
         if (
             !_GetWinID(msg, &winID) ||
             msg->FindBool("focusGained", &bSetFocus) != B_OK) {
@@ -350,7 +350,7 @@ class SDL_BLooper : public BLooper
         if (bSetFocus) {
             SDL_SetKeyboardFocus(win);
         } else if (SDL_GetKeyboardFocus() == win) {
-            /* Only lose all focus if this window was the current focus */
+            // Only lose all focus if this window was the current focus
             SDL_SetKeyboardFocus(NULL);
         }
     }
@@ -360,7 +360,7 @@ class SDL_BLooper : public BLooper
         SDL_Window *win;
         int32 winID;
         int32 xPos, yPos;
-        /* Get the window id and new x/y position of the window */
+        // Get the window id and new x/y position of the window
         if (
             !_GetWinID(msg, &winID) ||
             msg->FindInt32("window-x", &xPos) != B_OK ||
@@ -376,7 +376,7 @@ class SDL_BLooper : public BLooper
         SDL_Window *win;
         int32 winID;
         int32 w, h;
-        /* Get the window id ]and new x/y position of the window */
+        // Get the window id ]and new x/y position of the window
         if (
             !_GetWinID(msg, &winID) ||
             msg->FindInt32("window-w", &w) != B_OK ||
@@ -414,8 +414,8 @@ class SDL_BLooper : public BLooper
         _window_map.push_back(win);
     }
 
-    /* Members */
-    std::vector<SDL_Window *> _window_map; /* Keeps track of SDL_Windows by index-id */
+    // Members
+    std::vector<SDL_Window *> _window_map; // Keeps track of SDL_Windows by index-id
 
 #ifdef SDL_VIDEO_OPENGL
     BGLView *_current_context;

src/core/haiku/SDL_BeApp.cc

@@ -22,7 +22,7 @@
 
 #ifdef SDL_PLATFORM_HAIKU
 
-/* Handle the BeApp specific portions of the application */
+// Handle the BeApp specific portions of the application
 
 #include <AppKit.h>
 #include <storage/AppFileInfo.h>
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <memory>
 
-#include "SDL_BApp.h"   /* SDL_BLooper class definition */
+#include "SDL_BApp.h"   // SDL_BLooper class definition
 #include "SDL_BeApp.h"
 
 #include "../../video/haiku/SDL_BWin.h"
@@ -43,17 +43,17 @@ extern "C" {
 
 #include "../../thread/SDL_systhread.h"
 
-/* Flag to tell whether or not the Be application and looper are active or not */
+// Flag to tell whether or not the Be application and looper are active or not
 static int SDL_BeAppActive = 0;
 static SDL_Thread *SDL_AppThread = NULL;
 SDL_BLooper *SDL_Looper = NULL;
 
 
-/* Default application signature */
+// Default application signature
 const char *SDL_signature = "application/x-SDL-executable";
 
 
-/* Create a descendant of BApplication */
+// Create a descendant of BApplication
 class SDL_BApp : public BApplication {
 public:
     SDL_BApp(const char* signature) :
@@ -123,43 +123,43 @@ static int StartBeLooper()
 }
 
 
-/* Initialize the Be Application, if it's not already started */
+// Initialize the Be Application, if it's not already started
 int SDL_InitBeApp(void)
 {
-    /* Create the BApplication that handles appserver interaction */
+    // Create the BApplication that handles appserver interaction
     if (SDL_BeAppActive <= 0) {
         StartBeLooper();
 
-        /* Mark the application active */
+        // Mark the application active
         SDL_BeAppActive = 0;
     }
 
-    /* Increment the application reference count */
+    // Increment the application reference count
     ++SDL_BeAppActive;
 
-    /* The app is running, and we're ready to go */
+    // The app is running, and we're ready to go
     return 0;
 }
 
-/* Quit the Be Application, if there's nothing left to do */
+// Quit the Be Application, if there's nothing left to do
 void SDL_QuitBeApp(void)
 {
-    /* Decrement the application reference count */
+    // Decrement the application reference count
     --SDL_BeAppActive;
 
-    /* If the reference count reached zero, clean up the app */
+    // If the reference count reached zero, clean up the app
     if (SDL_BeAppActive == 0) {
         SDL_Looper->Lock();
         SDL_Looper->Quit();
         SDL_Looper = NULL;
         if (SDL_AppThread) {
-            if (be_app != NULL) {       /* Not tested */
+            if (be_app != NULL) {       // Not tested
                 be_app->PostMessage(B_QUIT_REQUESTED);
             }
             SDL_WaitThread(SDL_AppThread, NULL);
             SDL_AppThread = NULL;
         }
-        /* be_app should now be NULL since be_app has quit */
+        // be_app should now be NULL since be_app has quit
     }
 }
 
@@ -167,7 +167,7 @@ void SDL_QuitBeApp(void)
 }
 #endif
 
-/* SDL_BApp functions */
+// SDL_BApp functions
 void SDL_BLooper::ClearID(SDL_BWin *bwin) {
     _SetSDLWindow(NULL, bwin->GetID());
     int32 i = _GetNumWindowSlots() - 1;
@@ -177,4 +177,4 @@ void SDL_BLooper::ClearID(SDL_BWin *bwin) {
     }
 }
 
-#endif /* SDL_PLATFORM_HAIKU */
+#endif // SDL_PLATFORM_HAIKU

src/core/haiku/SDL_BeApp.h

@@ -23,15 +23,15 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* Handle the BeApp specific portions of the application */
+// Handle the BeApp specific portions of the application
 
-/* Initialize the Be Application, if it's not already started */
+// Initialize the Be Application, if it's not already started
 extern int SDL_InitBeApp(void);
 
-/* Quit the Be Application, if there's nothing left to do */
+// Quit the Be Application, if there's nothing left to do
 extern void SDL_QuitBeApp(void);
 
-/* Be Application Signature*/
+// Be Application Signature
 extern const char *SDL_signature;
 
 

src/core/linux/SDL_dbus.c

@@ -24,7 +24,7 @@
 #include "../../stdlib/SDL_vacopy.h"
 
 #ifdef SDL_USE_LIBDBUS
-/* we never link directly to libdbus. */
+// we never link directly to libdbus.
 static const char *dbus_library = "libdbus-1.so.3";
 static void *dbus_handle = NULL;
 static char *inhibit_handle = NULL;
@@ -111,7 +111,7 @@ static int LoadDBUSLibrary(void)
         dbus_handle = SDL_LoadObject(dbus_library);
         if (!dbus_handle) {
             retval = -1;
-            /* Don't call SDL_SetError(): SDL_LoadObject already did. */
+            // Don't call SDL_SetError(): SDL_LoadObject already did.
         } else {
             retval = LoadDBUSSyms();
             if (retval < 0) {
@@ -125,19 +125,19 @@ static int LoadDBUSLibrary(void)
 
 static SDL_SpinLock spinlock_dbus_init = 0;
 
-/* you must hold spinlock_dbus_init before calling this! */
+// you must hold spinlock_dbus_init before calling this!
 static void SDL_DBus_Init_Spinlocked(void)
 {
     static SDL_bool is_dbus_available = SDL_TRUE;
     if (!is_dbus_available) {
-        return; /* don't keep trying if this fails. */
+        return; // don't keep trying if this fails.
     }
 
     if (!dbus.session_conn) {
         DBusError err;
 
         if (LoadDBUSLibrary() == -1) {
-            is_dbus_available = SDL_FALSE; /* can't load at all? Don't keep trying. */
+            is_dbus_available = SDL_FALSE; // can't load at all? Don't keep trying.
             return;
         }
 
@@ -147,18 +147,18 @@ static void SDL_DBus_Init_Spinlocked(void)
         }
 
         dbus.error_init(&err);
-        /* session bus is required */
+        // session bus is required
 
         dbus.session_conn = dbus.bus_get_private(DBUS_BUS_SESSION, &err);
         if (dbus.error_is_set(&err)) {
             dbus.error_free(&err);
             SDL_DBus_Quit();
             is_dbus_available = SDL_FALSE;
-            return; /* oh well */
+            return; // oh well
         }
         dbus.connection_set_exit_on_disconnect(dbus.session_conn, 0);
 
-        /* system bus is optional */
+        // system bus is optional
         dbus.system_conn = dbus.bus_get_private(DBUS_BUS_SYSTEM, &err);
         if (!dbus.error_is_set(&err)) {
             dbus.connection_set_exit_on_disconnect(dbus.system_conn, 0);
@@ -170,7 +170,7 @@ static void SDL_DBus_Init_Spinlocked(void)
 
 void SDL_DBus_Init(void)
 {
-    SDL_LockSpinlock(&spinlock_dbus_init); /* make sure two threads can't init at same time, since this can happen before SDL_Init. */
+    SDL_LockSpinlock(&spinlock_dbus_init); // make sure two threads can't init at same time, since this can happen before SDL_Init.
     SDL_DBus_Init_Spinlocked();
     SDL_UnlockSpinlock(&spinlock_dbus_init);
 }
@@ -216,14 +216,14 @@ static SDL_bool SDL_DBus_CallMethodInternal(DBusConnection *conn, const char *no
         if (msg) {
             int firstarg;
             va_list ap_reply;
-            va_copy(ap_reply, ap); /* copy the arg list so we don't compete with D-Bus for it */
+            va_copy(ap_reply, ap); // copy the arg list so we don't compete with D-Bus for it
             firstarg = va_arg(ap, int);
             if ((firstarg == DBUS_TYPE_INVALID) || dbus.message_append_args_valist(msg, firstarg, ap)) {
                 DBusMessage *reply = dbus.connection_send_with_reply_and_block(conn, msg, 300, NULL);
                 if (reply) {
-                    /* skip any input args, get to output args. */
+                    // skip any input args, get to output args.
                     while ((firstarg = va_arg(ap_reply, int)) != DBUS_TYPE_INVALID) {
-                        /* we assume D-Bus already validated all this. */
+                        // we assume D-Bus already validated all this.
                         {
                             void *dumpptr = va_arg(ap_reply, void *);
                             (void)dumpptr;
@@ -361,8 +361,8 @@ SDL_bool SDL_DBus_QueryProperty(const char *node, const char *path, const char *
 
 void SDL_DBus_ScreensaverTickle(void)
 {
-    if (screensaver_cookie == 0 && !inhibit_handle) { /* no need to tickle if we're inhibiting. */
-        /* org.gnome.ScreenSaver is the legacy interface, but it'll either do nothing or just be a second harmless tickle on newer systems, so we leave it for now. */
+    if (screensaver_cookie == 0 && !inhibit_handle) { // no need to tickle if we're inhibiting.
+        // org.gnome.ScreenSaver is the legacy interface, but it'll either do nothing or just be a second harmless tickle on newer systems, so we leave it for now.
         SDL_DBus_CallVoidMethod("org.gnome.ScreenSaver", "/org/gnome/ScreenSaver", "org.gnome.ScreenSaver", "SimulateUserActivity", DBUS_TYPE_INVALID);
         SDL_DBus_CallVoidMethod("org.freedesktop.ScreenSaver", "/org/freedesktop/ScreenSaver", "org.freedesktop.ScreenSaver", "SimulateUserActivity", DBUS_TYPE_INVALID);
     }
@@ -443,8 +443,8 @@ SDL_bool SDL_DBus_ScreensaverInhibit(SDL_bool inhibit)
         const char *bus_name = "org.freedesktop.portal.Desktop";
         const char *path = "/org/freedesktop/portal/desktop";
         const char *interface = "org.freedesktop.portal.Inhibit";
-        const char *window = "";                    /* As a future improvement we could gather the X11 XID or Wayland surface identifier */
-        static const unsigned int INHIBIT_IDLE = 8; /* Taken from the portal API reference */
+        const char *window = "";                    // As a future improvement we could gather the X11 XID or Wayland surface identifier
+        static const unsigned int INHIBIT_IDLE = 8; // Taken from the portal API reference
         DBusMessageIter iterInit;
 
         if (inhibit) {
@@ -469,7 +469,7 @@ SDL_bool SDL_DBus_ScreensaverInhibit(SDL_bool inhibit)
 
             dbus.message_iter_init_append(msg, &iterInit);
 
-            /* a{sv} */
+            // a{sv}
             if (!SDL_DBus_AppendDictWithKeyValue(&iterInit, key, reason)) {
                 dbus.message_unref(msg);
                 return SDL_FALSE;
@@ -524,7 +524,7 @@ void SDL_DBus_PumpEvents(void)
         dbus.connection_read_write(dbus.session_conn, 0);
 
         while (dbus.connection_dispatch(dbus.session_conn) == DBUS_DISPATCH_DATA_REMAINS) {
-            /* Do nothing, actual work happens in DBus_MessageFilter */
+            // Do nothing, actual work happens in DBus_MessageFilter
             SDL_DelayNS(SDL_US_TO_NS(10));
         }
     }
@@ -541,7 +541,7 @@ char *SDL_DBus_GetLocalMachineId(void)
     dbus.error_init(&err);
 
     if (dbus.try_get_local_machine_id) {
-        /* Available since dbus 1.12.0, has proper error-handling */
+        // Available since dbus 1.12.0, has proper error-handling
         result = dbus.try_get_local_machine_id(&err);
     } else {
         /* Available since time immemorial, but has no error-handling:
@@ -575,12 +575,12 @@ char **SDL_DBus_DocumentsPortalRetrieveFiles(const char *key, int *path_count)
     DBusMessageIter iter, iterDict;
     char **paths = NULL;
     DBusMessage *reply = NULL;
-    DBusMessage *msg = dbus.message_new_method_call("org.freedesktop.portal.Documents",    /* Node */
-                                                    "/org/freedesktop/portal/documents",   /* Path */
-                                                    "org.freedesktop.portal.FileTransfer", /* Interface */
-                                                    "RetrieveFiles");                      /* Method */
+    DBusMessage *msg = dbus.message_new_method_call("org.freedesktop.portal.Documents",    // Node
+                                                    "/org/freedesktop/portal/documents",   // Path
+                                                    "org.freedesktop.portal.FileTransfer", // Interface
+                                                    "RetrieveFiles");                      // Method
 
-    /* Make sure we have a connection to the dbus session bus */
+    // Make sure we have a connection to the dbus session bus
     if (!SDL_DBus_GetContext() || !dbus.session_conn) {
         /* We either cannot connect to the session bus or were unable to
          * load the D-Bus library at all. */
@@ -589,7 +589,7 @@ char **SDL_DBus_DocumentsPortalRetrieveFiles(const char *key, int *path_count)
 
     dbus.error_init(&err);
 
-    /* First argument is a "application/vnd.portal.filetransfer" key from a DnD or clipboard event */
+    // First argument is a "application/vnd.portal.filetransfer" key from a DnD or clipboard event
     if (!dbus.message_append_args(msg, DBUS_TYPE_STRING, &key, DBUS_TYPE_INVALID)) {
         SDL_OutOfMemory();
         dbus.message_unref(msg);

src/core/linux/SDL_dbus.h

@@ -91,12 +91,12 @@ extern void SDL_DBus_Init(void);
 extern void SDL_DBus_Quit(void);
 extern SDL_DBusContext *SDL_DBus_GetContext(void);
 
-/* These use the built-in Session connection. */
+// These use the built-in Session connection.
 extern SDL_bool SDL_DBus_CallMethod(const char *node, const char *path, const char *interface, const char *method, ...);
 extern SDL_bool SDL_DBus_CallVoidMethod(const char *node, const char *path, const char *interface, const char *method, ...);
 extern SDL_bool SDL_DBus_QueryProperty(const char *node, const char *path, const char *interface, const char *property, const int expectedtype, void *result);
 
-/* These use whatever connection you like. */
+// These use whatever connection you like.
 extern SDL_bool SDL_DBus_CallMethodOnConnection(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *method, ...);
 extern SDL_bool SDL_DBus_CallVoidMethodOnConnection(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *method, ...);
 extern SDL_bool SDL_DBus_QueryPropertyOnConnection(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *property, const int expectedtype, void *result);
@@ -109,6 +109,6 @@ extern char *SDL_DBus_GetLocalMachineId(void);
 
 extern char **SDL_DBus_DocumentsPortalRetrieveFiles(const char *key, int *files_count);
 
-#endif /* HAVE_DBUS_DBUS_H */
+#endif // HAVE_DBUS_DBUS_H
 
-#endif /* SDL_dbus_h_ */
+#endif // SDL_dbus_h_

src/core/linux/SDL_evdev.c

@@ -22,7 +22,7 @@
 
 #ifdef SDL_INPUT_LINUXEV
 
-/* This is based on the linux joystick driver */
+// This is based on the linux joystick driver
 /* References: https://www.kernel.org/doc/Documentation/input/input.txt
  *             https://www.kernel.org/doc/Documentation/input/event-codes.txt
  *             /usr/include/linux/input.h
@@ -43,7 +43,7 @@
 #include "../../core/linux/SDL_evdev_capabilities.h"
 #include "../../core/linux/SDL_udev.h"
 
-/* These are not defined in older Linux kernel headers */
+// These are not defined in older Linux kernel headers
 #ifndef SYN_DROPPED
 #define SYN_DROPPED 3
 #endif
@@ -59,12 +59,12 @@
 #define REL_HWHEEL_HI_RES 0x0c
 #endif
 
-/* The field to look up in struct input_event for integer seconds */
+// The field to look up in struct input_event for integer seconds
 #ifndef input_event_sec
 #define input_event_sec time.tv_sec
 #endif
 
-/* The field to look up in struct input_event for fractional seconds */
+// The field to look up in struct input_event for fractional seconds
 #ifndef input_event_usec
 #define input_event_usec time.tv_usec
 #endif
@@ -75,7 +75,7 @@ typedef struct SDL_evdevlist_item
     int fd;
     int udev_class;
 
-    /* TODO: use this for every device, not just touchscreen */
+    // TODO: use this for every device, not just touchscreen
     SDL_bool out_of_sync;
 
     /* TODO: expand on this to have data for every possible class (mouse,
@@ -107,7 +107,7 @@ typedef struct SDL_evdevlist_item
 
     } *touchscreen_data;
 
-    /* Mouse state */
+    // Mouse state
     SDL_bool high_res_wheel;
     SDL_bool high_res_hwheel;
     SDL_bool relative_mouse;
@@ -137,22 +137,22 @@ static int SDL_EVDEV_device_removed(const char *dev_path);
 static int SDL_EVDEV_device_added(const char *dev_path, int udev_class);
 #ifdef SDL_USE_LIBUDEV
 static void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_event, int udev_class, const char *dev_path);
-#endif /* SDL_USE_LIBUDEV */
+#endif // SDL_USE_LIBUDEV
 
 static Uint8 EVDEV_MouseButtons[] = {
-    SDL_BUTTON_LEFT,   /*  BTN_LEFT        0x110 */
-    SDL_BUTTON_RIGHT,  /*  BTN_RIGHT       0x111 */
-    SDL_BUTTON_MIDDLE, /*  BTN_MIDDLE      0x112 */
-    SDL_BUTTON_X1,     /*  BTN_SIDE        0x113 */
-    SDL_BUTTON_X2,     /*  BTN_EXTRA       0x114 */
-    SDL_BUTTON_X2 + 1, /*  BTN_FORWARD     0x115 */
-    SDL_BUTTON_X2 + 2, /*  BTN_BACK        0x116 */
-    SDL_BUTTON_X2 + 3  /*  BTN_TASK        0x117 */
+    SDL_BUTTON_LEFT,   // BTN_LEFT        0x110
+    SDL_BUTTON_RIGHT,  // BTN_RIGHT       0x111
+    SDL_BUTTON_MIDDLE, // BTN_MIDDLE      0x112
+    SDL_BUTTON_X1,     // BTN_SIDE        0x113
+    SDL_BUTTON_X2,     // BTN_EXTRA       0x114
+    SDL_BUTTON_X2 + 1, // BTN_FORWARD     0x115
+    SDL_BUTTON_X2 + 2, // BTN_BACK        0x116
+    SDL_BUTTON_X2 + 3  // BTN_TASK        0x117
 };
 
 static int SDL_EVDEV_SetRelativeMouseMode(SDL_bool enabled)
 {
-    /* Mice already send relative events through this interface */
+    // Mice already send relative events through this interface
     return 0;
 }
 
@@ -180,7 +180,7 @@ int SDL_EVDEV_Init(void)
             return -1;
         }
 
-        /* Set up the udev callback */
+        // Set up the udev callback
         if (SDL_UDEV_AddCallback(SDL_EVDEV_udev_callback) < 0) {
             SDL_UDEV_Quit();
             SDL_free(_this);
@@ -188,7 +188,7 @@ int SDL_EVDEV_Init(void)
             return -1;
         }
 
-        /* Force a scan to build the initial device list */
+        // Force a scan to build the initial device list
         SDL_UDEV_Scan();
 #else
         {
@@ -212,10 +212,10 @@ int SDL_EVDEV_Init(void)
                     }
                 }
             } else {
-                /* TODO: Scan the devices manually, like a caveman */
+                // TODO: Scan the devices manually, like a caveman
             }
         }
-#endif /* SDL_USE_LIBUDEV */
+#endif // SDL_USE_LIBUDEV
 
         _this->kbd = SDL_EVDEV_kbd_init();
 
@@ -241,9 +241,9 @@ void SDL_EVDEV_Quit(void)
 #ifdef SDL_USE_LIBUDEV
         SDL_UDEV_DelCallback(SDL_EVDEV_udev_callback);
         SDL_UDEV_Quit();
-#endif /* SDL_USE_LIBUDEV */
+#endif // SDL_USE_LIBUDEV
 
-        /* Remove existing devices */
+        // Remove existing devices
         while (_this->first) {
             SDL_EVDEV_device_removed(_this->first->path);
         }
@@ -286,7 +286,7 @@ static void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_event, int udev_cl
         break;
     }
 }
-#endif /* SDL_USE_LIBUDEV */
+#endif // SDL_USE_LIBUDEV
 
 void SDL_EVDEV_SetVTSwitchCallbacks(void (*release_callback)(void*), void *release_callback_data,
                                     void (*acquire_callback)(void*), void *acquire_callback_data)
@@ -371,7 +371,7 @@ void SDL_EVDEV_Poll(void)
                         break;
                     }
 
-                    /* Probably keyboard */
+                    // Probably keyboard
                     scancode = SDL_EVDEV_translate_keycode(event->code);
                     if (event->value == 0) {
                         SDL_SendKeyboardKey(SDL_EVDEV_GetEventTimestamp(event), (SDL_KeyboardID)item->fd, event->code, scancode, SDL_RELEASED);
@@ -383,13 +383,13 @@ void SDL_EVDEV_Poll(void)
                 case EV_ABS:
                     switch (event->code) {
                     case ABS_MT_SLOT:
-                        if (!item->is_touchscreen) { /* FIXME: temp hack */
+                        if (!item->is_touchscreen) { // FIXME: temp hack
                             break;
                         }
                         item->touchscreen_data->current_slot = event->value;
                         break;
                     case ABS_MT_TRACKING_ID:
-                        if (!item->is_touchscreen) { /* FIXME: temp hack */
+                        if (!item->is_touchscreen) { // FIXME: temp hack
                             break;
                         }
                         if (event->value >= 0) {
@@ -400,7 +400,7 @@ void SDL_EVDEV_Poll(void)
                         }
                         break;
                     case ABS_MT_POSITION_X:
-                        if (!item->is_touchscreen) { /* FIXME: temp hack */
+                        if (!item->is_touchscreen) { // FIXME: temp hack
                             break;
                         }
                         item->touchscreen_data->slots[item->touchscreen_data->current_slot].x = event->value;
@@ -409,7 +409,7 @@ void SDL_EVDEV_Poll(void)
                         }
                         break;
                     case ABS_MT_POSITION_Y:
-                        if (!item->is_touchscreen) { /* FIXME: temp hack */
+                        if (!item->is_touchscreen) { // FIXME: temp hack
                             break;
                         }
                         item->touchscreen_data->slots[item->touchscreen_data->current_slot].y = event->value;
@@ -418,7 +418,7 @@ void SDL_EVDEV_Poll(void)
                         }
                         break;
                     case ABS_MT_PRESSURE:
-                        if (!item->is_touchscreen) { /* FIXME: temp hack */
+                        if (!item->is_touchscreen) { // FIXME: temp hack
                             break;
                         }
                         item->touchscreen_data->slots[item->touchscreen_data->current_slot].pressure = event->value;
@@ -487,7 +487,7 @@ void SDL_EVDEV_Poll(void)
                 case EV_SYN:
                     switch (event->code) {
                     case SYN_REPORT:
-                        /* Send mouse axis changes together to ensure consistency and reduce event processing overhead */
+                        // Send mouse axis changes together to ensure consistency and reduce event processing overhead
                         if (item->relative_mouse) {
                             if (item->mouse_x != 0 || item->mouse_y != 0) {
                                 SDL_SendMouseMotion(SDL_EVDEV_GetEventTimestamp(event), mouse->focus, (SDL_MouseID)item->fd, item->relative_mouse, (float)item->mouse_x, (float)item->mouse_y);
@@ -521,7 +521,7 @@ void SDL_EVDEV_Poll(void)
                             item->mouse_wheel = item->mouse_hwheel = 0;
                         }
 
-                        if (!item->is_touchscreen) { /* FIXME: temp hack */
+                        if (!item->is_touchscreen) { // FIXME: temp hack
                             break;
                         }
 
@@ -535,7 +535,7 @@ void SDL_EVDEV_Poll(void)
                                 norm_pressure = (float)(item->touchscreen_data->slots[j].pressure - item->touchscreen_data->min_pressure) /
                                                 (float)item->touchscreen_data->range_pressure;
                             } else {
-                                /* This touchscreen does not support pressure */
+                                // This touchscreen does not support pressure
                                 norm_pressure = 1.0f;
                             }
 
@@ -598,7 +598,7 @@ static SDL_Scancode SDL_EVDEV_translate_keycode(int keycode)
                     keycode);
         }
     }
-#endif /* DEBUG_SCANCODES */
+#endif // DEBUG_SCANCODES
 
     return scancode;
 }
@@ -741,7 +741,7 @@ static int SDL_EVDEV_init_touchscreen(SDL_evdevlist_item *item, int udev_class)
         return -1;
     }
 
-    ret = SDL_AddTouch(item->fd, /* I guess our fd is unique enough */
+    ret = SDL_AddTouch(item->fd, // I guess our fd is unique enough
                        (udev_class & SDL_UDEV_DEVICE_TOUCHPAD) ? SDL_TOUCH_DEVICE_INDIRECT_ABSOLUTE : SDL_TOUCH_DEVICE_DIRECT,
                        item->touchscreen_data->name);
     if (ret < 0) {
@@ -783,7 +783,7 @@ static void SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
     Sint32 *mt_req_values;
     size_t mt_req_size;
 
-    /* TODO: sync devices other than touchscreen */
+    // TODO: sync devices other than touchscreen
     if (!item->is_touchscreen) {
         return;
     }
@@ -888,7 +888,7 @@ static void SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
 
     SDL_free(mt_req_code);
 
-#endif /* EVIOCGMTSLOTS */
+#endif // EVIOCGMTSLOTS
 }
 
 static int SDL_EVDEV_device_added(const char *dev_path, int udev_class)
@@ -896,10 +896,10 @@ static int SDL_EVDEV_device_added(const char *dev_path, int udev_class)
     SDL_evdevlist_item *item;
     unsigned long relbit[NBITS(REL_MAX)] = { 0 };
 
-    /* Check to make sure it's not already in list. */
+    // Check to make sure it's not already in list.
     for (item = _this->first; item; item = item->next) {
         if (SDL_strcmp(dev_path, item->path) == 0) {
-            return -1; /* already have this one */
+            return -1; // already have this one
         }
     }
 
@@ -929,7 +929,7 @@ static int SDL_EVDEV_device_added(const char *dev_path, int udev_class)
         item->high_res_hwheel = test_bit(REL_HWHEEL_HI_RES, relbit);
     }
 
-    /* For now, we just treat a touchpad like a touchscreen */
+    // For now, we just treat a touchpad like a touchscreen
     if (udev_class & (SDL_UDEV_DEVICE_TOUCHSCREEN | SDL_UDEV_DEVICE_TOUCHPAD)) {
         int ret;
         item->is_touchscreen = SDL_TRUE;
@@ -978,7 +978,7 @@ static int SDL_EVDEV_device_removed(const char *dev_path)
     SDL_evdevlist_item *prev = NULL;
 
     for (item = _this->first; item; item = item->next) {
-        /* found it, remove it. */
+        // found it, remove it.
         if (SDL_strcmp(dev_path, item->path) == 0) {
             if (prev) {
                 prev->next = item->next;
@@ -1033,4 +1033,4 @@ Uint64 SDL_EVDEV_GetEventTimestamp(struct input_event *event)
     return timestamp;
 }
 
-#endif /* SDL_INPUT_LINUXEV */
+#endif // SDL_INPUT_LINUXEV

src/core/linux/SDL_evdev.h

@@ -36,6 +36,6 @@ extern int SDL_EVDEV_GetDeviceCount(int device_class);
 extern void SDL_EVDEV_Poll(void);
 extern Uint64 SDL_EVDEV_GetEventTimestamp(struct input_event *event);
 
-#endif /* SDL_INPUT_LINUXEV */
+#endif // SDL_INPUT_LINUXEV
 
-#endif /* SDL_evdev_h_ */
+#endif // SDL_evdev_h_

src/core/linux/SDL_evdev_capabilities.c

@@ -25,7 +25,7 @@
 
 #ifdef HAVE_LINUX_INPUT_H
 
-/* missing defines in older Linux kernel headers */
+// missing defines in older Linux kernel headers
 #ifndef BTN_TRIGGER_HAPPY
 #define BTN_TRIGGER_HAPPY 0x2c0
 #endif
@@ -49,7 +49,7 @@ SDL_EVDEV_GuessDeviceClass(const unsigned long bitmask_props[NBITS(INPUT_PROP_MA
         unsigned end;
     };
 
-    /* key code ranges above BTN_MISC (start is inclusive, stop is exclusive)*/
+    // key code ranges above BTN_MISC (start is inclusive, stop is exclusive)
     static const struct range high_key_blocks[] = {
         { KEY_OK, BTN_DPAD_UP },
         { KEY_ALS_TOGGLE, BTN_TRIGGER_HAPPY }
@@ -58,24 +58,24 @@ SDL_EVDEV_GuessDeviceClass(const unsigned long bitmask_props[NBITS(INPUT_PROP_MA
     int devclass = 0;
     unsigned long keyboard_mask;
 
-    /* If the kernel specifically says it's an accelerometer, believe it */
+    // If the kernel specifically says it's an accelerometer, believe it
     if (test_bit(INPUT_PROP_ACCELEROMETER, bitmask_props)) {
         return SDL_UDEV_DEVICE_ACCELEROMETER;
     }
 
-    /* We treat pointing sticks as indistinguishable from mice */
+    // We treat pointing sticks as indistinguishable from mice
     if (test_bit(INPUT_PROP_POINTING_STICK, bitmask_props)) {
         return SDL_UDEV_DEVICE_MOUSE;
     }
 
-    /* We treat buttonpads as equivalent to touchpads */
+    // We treat buttonpads as equivalent to touchpads
     if (test_bit(INPUT_PROP_TOPBUTTONPAD, bitmask_props) ||
         test_bit(INPUT_PROP_BUTTONPAD, bitmask_props) ||
         test_bit(INPUT_PROP_SEMI_MT, bitmask_props)) {
         return SDL_UDEV_DEVICE_TOUCHPAD;
     }
 
-    /* X, Y, Z axes but no buttons probably means an accelerometer */
+    // X, Y, Z axes but no buttons probably means an accelerometer
     if (test_bit(EV_ABS, bitmask_ev) &&
         test_bit(ABS_X, bitmask_abs) &&
         test_bit(ABS_Y, bitmask_abs) &&
@@ -97,15 +97,15 @@ SDL_EVDEV_GuessDeviceClass(const unsigned long bitmask_props[NBITS(INPUT_PROP_MA
     if (test_bit(EV_ABS, bitmask_ev) &&
         test_bit(ABS_X, bitmask_abs) && test_bit(ABS_Y, bitmask_abs)) {
         if (test_bit(BTN_STYLUS, bitmask_key) || test_bit(BTN_TOOL_PEN, bitmask_key)) {
-            ; /* ID_INPUT_TABLET */
+            ; // ID_INPUT_TABLET
         } else if (test_bit(BTN_TOOL_FINGER, bitmask_key) && !test_bit(BTN_TOOL_PEN, bitmask_key)) {
-            devclass |= SDL_UDEV_DEVICE_TOUCHPAD; /* ID_INPUT_TOUCHPAD */
+            devclass |= SDL_UDEV_DEVICE_TOUCHPAD; // ID_INPUT_TOUCHPAD
         } else if (test_bit(BTN_MOUSE, bitmask_key)) {
-            devclass |= SDL_UDEV_DEVICE_MOUSE; /* ID_INPUT_MOUSE */
+            devclass |= SDL_UDEV_DEVICE_MOUSE; // ID_INPUT_MOUSE
         } else if (test_bit(BTN_TOUCH, bitmask_key)) {
             /* TODO: better determining between touchscreen and multitouch touchpad,
                see https://github.com/systemd/systemd/blob/master/src/udev/udev-builtin-input_id.c */
-            devclass |= SDL_UDEV_DEVICE_TOUCHSCREEN; /* ID_INPUT_TOUCHSCREEN */
+            devclass |= SDL_UDEV_DEVICE_TOUCHSCREEN; // ID_INPUT_TOUCHSCREEN
         }
 
         if (test_bit(BTN_TRIGGER, bitmask_key) ||
@@ -119,14 +119,14 @@ SDL_EVDEV_GuessDeviceClass(const unsigned long bitmask_props[NBITS(INPUT_PROP_MA
             test_bit(ABS_WHEEL, bitmask_abs) ||
             test_bit(ABS_GAS, bitmask_abs) ||
             test_bit(ABS_BRAKE, bitmask_abs)) {
-            devclass |= SDL_UDEV_DEVICE_JOYSTICK; /* ID_INPUT_JOYSTICK */
+            devclass |= SDL_UDEV_DEVICE_JOYSTICK; // ID_INPUT_JOYSTICK
         }
     }
 
     if (test_bit(EV_REL, bitmask_ev) &&
         test_bit(REL_X, bitmask_rel) && test_bit(REL_Y, bitmask_rel) &&
         test_bit(BTN_MOUSE, bitmask_key)) {
-        devclass |= SDL_UDEV_DEVICE_MOUSE; /* ID_INPUT_MOUSE */
+        devclass |= SDL_UDEV_DEVICE_MOUSE; // ID_INPUT_MOUSE
     }
 
     if (test_bit(EV_KEY, bitmask_ev)) {
@@ -136,7 +136,7 @@ SDL_EVDEV_GuessDeviceClass(const unsigned long bitmask_props[NBITS(INPUT_PROP_MA
         for (i = 0; i < BTN_MISC / BITS_PER_LONG; ++i) {
             found |= bitmask_key[i];
         }
-        /* If there are no keys in the lower block, check the higher blocks */
+        // If there are no keys in the lower block, check the higher blocks
         if (!found) {
             unsigned block;
             for (block = 0; block < (sizeof(high_key_blocks) / sizeof(struct range)); ++block) {
@@ -150,7 +150,7 @@ SDL_EVDEV_GuessDeviceClass(const unsigned long bitmask_props[NBITS(INPUT_PROP_MA
         }
 
         if (found > 0) {
-            devclass |= SDL_UDEV_DEVICE_HAS_KEYS; /* ID_INPUT_KEY */
+            devclass |= SDL_UDEV_DEVICE_HAS_KEYS; // ID_INPUT_KEY
         }
     }
 
@@ -159,10 +159,10 @@ SDL_EVDEV_GuessDeviceClass(const unsigned long bitmask_props[NBITS(INPUT_PROP_MA
      * do not test KEY_RESERVED, though */
     keyboard_mask = 0xFFFFFFFE;
     if ((bitmask_key[0] & keyboard_mask) == keyboard_mask) {
-        devclass |= SDL_UDEV_DEVICE_KEYBOARD; /* ID_INPUT_KEYBOARD */
+        devclass |= SDL_UDEV_DEVICE_KEYBOARD; // ID_INPUT_KEYBOARD
     }
 
     return devclass;
 }
 
-#endif /* HAVE_LINUX_INPUT_H */
+#endif // HAVE_LINUX_INPUT_H

src/core/linux/SDL_evdev_capabilities.h

@@ -44,7 +44,7 @@
 #define INPUT_PROP_MAX 0x1f
 #endif
 
-/* A device can be any combination of these classes */
+// A device can be any combination of these classes
 typedef enum
 {
     SDL_UDEV_DEVICE_UNKNOWN = 0x0000,
@@ -71,6 +71,6 @@ extern int SDL_EVDEV_GuessDeviceClass(const unsigned long bitmask_props[NBITS(IN
                                       const unsigned long bitmask_key[NBITS(KEY_MAX)],
                                       const unsigned long bitmask_rel[NBITS(REL_MAX)]);
 
-#endif /* HAVE_LINUX_INPUT_H */
+#endif // HAVE_LINUX_INPUT_H
 
-#endif /* SDL_evdev_capabilities_h_ */
+#endif // SDL_evdev_capabilities_h_

src/core/linux/SDL_evdev_kbd.c

@@ -24,7 +24,7 @@
 
 #ifdef SDL_INPUT_LINUXKD
 
-/* This logic is adapted from drivers/tty/vt/keyboard.c in the Linux kernel source */
+// This logic is adapted from drivers/tty/vt/keyboard.c in the Linux kernel source
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -32,7 +32,7 @@
 #include <linux/kd.h>
 #include <linux/keyboard.h>
 #include <linux/vt.h>
-#include <linux/tiocl.h> /* for TIOCL_GETSHIFTSTATE */
+#include <linux/tiocl.h> // for TIOCL_GETSHIFTSTATE
 
 #include <signal.h>
 
@@ -40,7 +40,7 @@
 #include "SDL_evdev_kbd_default_accents.h"
 #include "SDL_evdev_kbd_default_keymap.h"
 
-/* These are not defined in older Linux kernel headers */
+// These are not defined in older Linux kernel headers
 #ifndef K_UNICODE
 #define K_UNICODE 0x03
 #endif
@@ -87,12 +87,12 @@ struct SDL_EVDEV_keyboard_state
     SDL_bool muted;
     int old_kbd_mode;
     unsigned short **key_maps;
-    unsigned char shift_down[NR_SHIFT]; /* shift state counters.. */
+    unsigned char shift_down[NR_SHIFT]; // shift state counters..
     SDL_bool dead_key_next;
-    int npadch; /* -1 or number assembled on pad */
+    int npadch; // -1 or number assembled on pad
     struct kbdiacrs *accents;
     unsigned int diacr;
-    SDL_bool rep; /* flag telling character repeat */
+    SDL_bool rep; // flag telling character repeat
     unsigned char lockstate;
     unsigned char slockstate;
     unsigned char ledflagstate;
@@ -125,7 +125,7 @@ static void SDL_EVDEV_dump_accents(SDL_EVDEV_keyboard_state *kbd)
     printf("    }\n");
     printf("};\n");
 }
-#endif /* DUMP_ACCENTS */
+#endif // DUMP_ACCENTS
 
 #ifdef DUMP_KEYMAP
 static void SDL_EVDEV_dump_keymap(SDL_EVDEV_keyboard_state *kbd)
@@ -155,7 +155,7 @@ static void SDL_EVDEV_dump_keymap(SDL_EVDEV_keyboard_state *kbd)
     }
     printf("};\n");
 }
-#endif /* DUMP_KEYMAP */
+#endif // DUMP_KEYMAP
 
 static SDL_EVDEV_keyboard_state *kbd_cleanup_state = NULL;
 static int kbd_cleanup_sigactions_installed = 0;
@@ -164,7 +164,7 @@ static int kbd_cleanup_atexit_installed = 0;
 static struct sigaction old_sigaction[NSIG];
 
 static int fatal_signals[] = {
-    /* Handlers for SIGTERM and SIGINT are installed in SDL_InitQuit. */
+    // Handlers for SIGTERM and SIGINT are installed in SDL_InitQuit.
     SIGHUP, SIGQUIT, SIGILL, SIGABRT,
     SIGFPE, SIGSEGV, SIGPIPE, SIGBUS,
     SIGSYS
@@ -194,22 +194,22 @@ static void kbd_cleanup_signal_action(int signum, siginfo_t *info, void *ucontex
     struct sigaction *old_action_p = &(old_sigaction[signum]);
     sigset_t sigset;
 
-    /* Restore original signal handler before going any further. */
+    // Restore original signal handler before going any further.
     sigaction(signum, old_action_p, NULL);
 
-    /* Unmask current signal. */
+    // Unmask current signal.
     sigemptyset(&sigset);
     sigaddset(&sigset, signum);
     sigprocmask(SIG_UNBLOCK, &sigset, NULL);
 
-    /* Save original signal info and context for archeologists. */
+    // Save original signal info and context for archeologists.
     SDL_EVDEV_kdb_cleanup_siginfo = info;
     SDL_EVDEV_kdb_cleanup_ucontext = ucontext;
 
-    /* Restore keyboard. */
+    // Restore keyboard.
     kbd_cleanup();
 
-    /* Reraise signal. */
+    // Reraise signal.
     SDL_EVDEV_kbd_reraise_signal(signum);
 }
 
@@ -230,27 +230,27 @@ static void kbd_unregister_emerg_cleanup(void)
         int signum = fatal_signals[tabidx];
         old_action_p = &(old_sigaction[signum]);
 
-        /* Examine current signal action */
+        // Examine current signal action
         if (sigaction(signum, NULL, &cur_action)) {
             continue;
         }
 
-        /* Check if action installed and not modified */
+        // Check if action installed and not modified
         if (!(cur_action.sa_flags & SA_SIGINFO) || cur_action.sa_sigaction != &kbd_cleanup_signal_action) {
             continue;
         }
 
-        /* Restore original action */
+        // Restore original action
         sigaction(signum, old_action_p, NULL);
     }
 }
 
 static void kbd_cleanup_atexit(void)
 {
-    /* Restore keyboard. */
+    // Restore keyboard.
     kbd_cleanup();
 
-    /* Try to restore signal handlers in case shared library is being unloaded */
+    // Try to restore signal handlers in case shared library is being unloaded
     kbd_unregister_emerg_cleanup();
 }
 
@@ -333,7 +333,7 @@ static SDL_bool setup_vt_signal(int signum, signal_handler handler)
         return SDL_FALSE;
     }
     if (old_action_p->sa_handler != SIG_DFL) {
-        /* This signal is already in use */
+        // This signal is already in use
         sigaction(signum, old_action_p, NULL);
         return SDL_FALSE;
     }
@@ -432,7 +432,7 @@ SDL_EVDEV_keyboard_state *SDL_EVDEV_kbd_init(void)
         return NULL;
     }
 
-    /* This might fail if we're not connected to a tty (e.g. on the Steam Link) */
+    // This might fail if we're not connected to a tty (e.g. on the Steam Link)
     kbd->console_fd = open("/dev/tty", O_RDONLY | O_CLOEXEC);
     if (!((ioctl(kbd->console_fd, KDGKBTYPE, &kbtype) == 0) && ((kbtype == KB_101) || (kbtype == KB_84)))) {
         close(kbd->console_fd);
@@ -453,7 +453,7 @@ SDL_EVDEV_keyboard_state *SDL_EVDEV_kbd_init(void)
     kbd->key_maps = default_key_maps;
 
     if (ioctl(kbd->console_fd, KDGKBMODE, &kbd->old_kbd_mode) == 0) {
-        /* Set the keyboard in UNICODE mode and load the keymaps */
+        // Set the keyboard in UNICODE mode and load the keymaps
         ioctl(kbd->console_fd, KDSKBMODE, K_UNICODE);
     }
 
@@ -489,7 +489,7 @@ void SDL_EVDEV_kbd_set_muted(SDL_EVDEV_keyboard_state *state, SDL_bool muted)
     } else {
         kbd_unregister_emerg_cleanup();
 
-        /* Restore the original keyboard mode */
+        // Restore the original keyboard mode
         ioctl(state->console_fd, KDSKBMODE, state->old_kbd_mode);
     }
     state->muted = muted;
@@ -549,7 +549,7 @@ void SDL_EVDEV_kbd_quit(SDL_EVDEV_keyboard_state *state)
  */
 static void put_queue(SDL_EVDEV_keyboard_state *kbd, uint c)
 {
-    /* c is already part of a UTF-8 sequence and safe to add as a character */
+    // c is already part of a UTF-8 sequence and safe to add as a character
     if (kbd->text_len < (sizeof(kbd->text) - 1)) {
         kbd->text[kbd->text_len++] = (char)c;
     }
@@ -599,7 +599,7 @@ static unsigned int handle_diacr(SDL_EVDEV_keyboard_state *kbd, unsigned int ch)
 
     if (kbd->console_fd >= 0)
         if (ioctl(kbd->console_fd, KDGKBDIACR, kbd->accents) < 0) {
-            /* No worries, we'll use the default accent table */
+            // No worries, we'll use the default accent table
         }
 
     for (i = 0; i < kbd->accents->kb_cnt; i++) {
@@ -721,7 +721,7 @@ static void k_lowercase(SDL_EVDEV_keyboard_state *kbd, unsigned char value, char
 static void k_self(SDL_EVDEV_keyboard_state *kbd, unsigned char value, char up_flag)
 {
     if (up_flag) {
-        return; /* no action, if this is a key release */
+        return; // no action, if this is a key release
     }
 
     if (kbd->diacr) {
@@ -774,11 +774,11 @@ static void k_pad(SDL_EVDEV_keyboard_state *kbd, unsigned char value, char up_fl
     static const char pad_chars[] = "0123456789+-*/\015,.?()#";
 
     if (up_flag) {
-        return; /* no action, if this is a key release */
+        return; // no action, if this is a key release
     }
 
     if (!vc_kbd_led(kbd, K_NUMLOCK)) {
-        /* unprintable action */
+        // unprintable action
         return;
     }
 
@@ -821,7 +821,7 @@ static void k_shift(SDL_EVDEV_keyboard_state *kbd, unsigned char value, char up_
         kbd->shift_state &= ~(1 << value);
     }
 
-    /* kludge */
+    // kludge
     if (up_flag && kbd->shift_state != old_state && kbd->npadch != -1) {
         put_utf8(kbd, kbd->npadch);
         kbd->npadch = -1;
@@ -841,10 +841,10 @@ static void k_ascii(SDL_EVDEV_keyboard_state *kbd, unsigned char value, char up_
     }
 
     if (value < 10) {
-        /* decimal input of code, while Alt depressed */
+        // decimal input of code, while Alt depressed
         base = 10;
     } else {
-        /* hexadecimal input of code, while AltGr depressed */
+        // hexadecimal input of code, while AltGr depressed
         value -= 10;
         base = 16;
     }
@@ -873,7 +873,7 @@ static void k_slock(SDL_EVDEV_keyboard_state *kbd, unsigned char value, char up_
     }
 
     chg_vc_kbd_slock(kbd, value);
-    /* try to make Alt, oops, AltGr and such work */
+    // try to make Alt, oops, AltGr and such work
     if (!kbd->key_maps[kbd->lockstate ^ kbd->slockstate]) {
         kbd->slockstate = 0;
         chg_vc_kbd_slock(kbd, value);
@@ -900,7 +900,7 @@ void SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *state, unsigned int keycode
     shift_final = (state->shift_state | state->slockstate) ^ state->lockstate;
     key_map = state->key_maps[shift_final];
     if (!key_map) {
-        /* Unsupported shift state (e.g. ctrl = 4, alt = 8), just reset to the default state */
+        // Unsupported shift state (e.g. ctrl = 4, alt = 8), just reset to the default state
         state->shift_state = 0;
         state->slockstate = 0;
         state->lockstate = 0;
@@ -932,7 +932,7 @@ void SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *state, unsigned int keycode
     } else {
         type -= 0xf0;
 
-        /* if type is KT_LETTER then it can be affected by Caps Lock */
+        // if type is KT_LETTER then it can be affected by Caps Lock
         if (type == KT_LETTER) {
             type = KT_LATIN;
 
@@ -967,7 +967,7 @@ void SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *state, unsigned int keycode
     }
 }
 
-#elif !defined(SDL_INPUT_FBSDKBIO) /* !SDL_INPUT_LINUXKD */
+#elif !defined(SDL_INPUT_FBSDKBIO) // !SDL_INPUT_LINUXKD
 
 SDL_EVDEV_keyboard_state *SDL_EVDEV_kbd_init(void)
 {
@@ -994,4 +994,4 @@ void SDL_EVDEV_kbd_quit(SDL_EVDEV_keyboard_state *state)
 {
 }
 
-#endif /* SDL_INPUT_LINUXKD */
+#endif // SDL_INPUT_LINUXKD

src/core/linux/SDL_evdev_kbd.h

@@ -32,4 +32,4 @@ extern void SDL_EVDEV_kbd_update(SDL_EVDEV_keyboard_state *state);
 extern void SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *state, unsigned int keycode, int down);
 extern void SDL_EVDEV_kbd_quit(SDL_EVDEV_keyboard_state *state);
 
-#endif /* SDL_evdev_kbd_h_ */
+#endif // SDL_evdev_kbd_h_

src/core/linux/SDL_fcitx.c

@@ -76,7 +76,7 @@ static char *GetAppName(void)
             return SDL_strdup(linkfile);
         }
     }
-#endif /* SDL_PLATFORM_LINUX || SDL_PLATFORM_FREEBSD */
+#endif // SDL_PLATFORM_LINUX || SDL_PLATFORM_FREEBSD
 
     return SDL_strdup("SDL_App");
 }
@@ -94,10 +94,10 @@ static size_t Fcitx_GetPreeditString(SDL_DBusContext *dbus,
     Sint32 p_end_pos = -1;
 
     dbus->message_iter_init(msg, &iter);
-    /* Message type is a(si)i, we only need string part */
+    // Message type is a(si)i, we only need string part
     if (dbus->message_iter_get_arg_type(&iter) == DBUS_TYPE_ARRAY) {
         size_t pos = 0;
-        /* First pass: calculate string length */
+        // First pass: calculate string length
         dbus->message_iter_recurse(&iter, &array);
         while (dbus->message_iter_get_arg_type(&array) == DBUS_TYPE_STRUCT) {
             dbus->message_iter_recurse(&array, &sub);
@@ -110,12 +110,12 @@ static size_t Fcitx_GetPreeditString(SDL_DBusContext *dbus,
             }
             dbus->message_iter_next(&sub);
             if (dbus->message_iter_get_arg_type(&sub) == DBUS_TYPE_INT32 && p_end_pos == -1) {
-                /* Type is a bit field defined as follows:                */
-                /* bit 3: Underline, bit 4: HighLight, bit 5: DontCommit, */
-                /* bit 6: Bold,      bit 7: Strike,    bit 8: Italic      */
+                // Type is a bit field defined as follows:
+                // bit 3: Underline, bit 4: HighLight, bit 5: DontCommit,
+                // bit 6: Bold,      bit 7: Strike,    bit 8: Italic
                 Sint32 type;
                 dbus->message_iter_get_basic(&sub, &type);
-                /* We only consider highlight */
+                // We only consider highlight
                 if (type & (1 << 4)) {
                     if (p_start_pos == -1) {
                         p_start_pos = pos;
@@ -138,7 +138,7 @@ static size_t Fcitx_GetPreeditString(SDL_DBusContext *dbus,
 
         if (text) {
             char *pivot = text;
-            /* Second pass: join all the sub string */
+            // Second pass: join all the sub string
             dbus->message_iter_recurse(&iter, &array);
             while (dbus->message_iter_get_arg_type(&array) == DBUS_TYPE_STRUCT) {
                 dbus->message_iter_recurse(&array, &sub);
@@ -239,8 +239,8 @@ static void SDLCALL Fcitx_SetCapabilities(void *data,
     }
 
     if (hint && SDL_strstr(hint, "composition")) {
-        caps |= (1 << 1); /* Preedit Flag */
-        caps |= (1 << 4); /* Formatted Preedit Flag */
+        caps |= (1 << 1); // Preedit Flag
+        caps |= (1 << 4); // Formatted Preedit Flag
     }
     if (hint && SDL_strstr(hint, "candidates")) {
         // FIXME, turn off native candidate rendering
@@ -285,9 +285,9 @@ static SDL_bool FcitxClientCreateIC(FcitxClient *client)
     char *ic_path = NULL;
     SDL_DBusContext *dbus = client->dbus;
 
-    /* SDL_DBus_CallMethod cannot handle a(ss) type, call dbus function directly */
+    // SDL_DBus_CallMethod cannot handle a(ss) type, call dbus function directly
     if (!FcitxCreateInputContext(dbus, appname, &ic_path)) {
-        ic_path = NULL; /* just in case. */
+        ic_path = NULL; // just in case.
     }
 
     SDL_free(appname);
@@ -433,7 +433,7 @@ void SDL_Fcitx_UpdateTextInputArea(SDL_Window *window)
 #endif
 
     if (cursor->x == -1 && cursor->y == -1 && cursor->w == 0 && cursor->h == 0) {
-        /* move to bottom left */
+        // move to bottom left
         int w = 0, h = 0;
         SDL_GetWindowSize(window, &w, &h);
         cursor->x = 0;
@@ -455,6 +455,6 @@ void SDL_Fcitx_PumpEvents(void)
     dbus->connection_read_write(conn, 0);
 
     while (dbus->connection_dispatch(conn) == DBUS_DISPATCH_DATA_REMAINS) {
-        /* Do nothing, actual work happens in DBus_MessageFilter */
+        // Do nothing, actual work happens in DBus_MessageFilter
     }
 }

src/core/linux/SDL_fcitx.h

@@ -32,4 +32,4 @@ extern SDL_bool SDL_Fcitx_ProcessKeyEvent(Uint32 keysym, Uint32 keycode, Uint8 s
 extern void SDL_Fcitx_UpdateTextInputArea(SDL_Window *window);
 extern void SDL_Fcitx_PumpEvents(void);
 
-#endif /* SDL_fcitx_h_ */
+#endif // SDL_fcitx_h_

src/core/linux/SDL_ibus.c

@@ -62,7 +62,7 @@ static Uint32 IBus_ModState(void)
     Uint32 ibus_mods = 0;
     SDL_Keymod sdl_mods = SDL_GetModState();
 
-    /* Not sure about MOD3, MOD4 and HYPER mappings */
+    // Not sure about MOD3, MOD4 and HYPER mappings
     if (sdl_mods & SDL_KMOD_LSHIFT) {
         ibus_mods |= IBUS_SHIFT_MASK;
     }
@@ -152,16 +152,16 @@ static SDL_bool IBus_GetDecorationPosition(DBusConnection *conn, DBusMessageIter
             dbus->message_iter_next(&sub);
             dbus->message_iter_next(&sub);
 
-            /* From here on, the structure looks like this:                    */
-            /* Uint32 type: 1=underline, 2=foreground, 3=background            */
-            /* Uint32 value: for underline it's 0=NONE, 1=SINGLE, 2=DOUBLE,    */
-            /*                                    3=LOW,  4=ERROR              */
-            /*                 for foreground and background it's a color      */
-            /* Uint32 start_index: starting position for the style (utf8-char) */
-            /* Uint32 end_index: end position for the style (utf8-char)        */
+            // From here on, the structure looks like this:
+            // Uint32 type: 1=underline, 2=foreground, 3=background
+            // Uint32 value: for underline it's 0=NONE, 1=SINGLE, 2=DOUBLE,
+            // 3=LOW,  4=ERROR
+            // for foreground and background it's a color
+            // Uint32 start_index: starting position for the style (utf8-char)
+            // Uint32 end_index: end position for the style (utf8-char)
 
             dbus->message_iter_get_basic(&sub, &type);
-            /* We only use the background type to determine the selection */
+            // We only use the background type to determine the selection
             if (type == 3) {
                 Uint32 start = -1;
                 dbus->message_iter_next(&sub);
@@ -184,7 +184,7 @@ static SDL_bool IBus_GetDecorationPosition(DBusConnection *conn, DBusMessageIter
 
 static const char *IBus_GetVariantText(DBusConnection *conn, DBusMessageIter *iter, SDL_DBusContext *dbus)
 {
-    /* The text we need is nested weirdly, use dbus-monitor to see the structure better */
+    // The text we need is nested weirdly, use dbus-monitor to see the structure better
     const char *text = NULL;
     DBusMessageIter sub;
 
@@ -330,7 +330,7 @@ static char *IBus_GetDBusAddressFilename(void)
         return NULL;
     }
 
-    /* Use this environment variable if it exists. */
+    // Use this environment variable if it exists.
     addr = SDL_getenv("IBUS_ADDRESS");
     if (addr && *addr) {
         return SDL_strdup(addr);
@@ -453,7 +453,7 @@ static SDL_bool IBus_SetupConnection(SDL_DBusContext *dbus, const char *addr)
         ibus_conn = dbus->connection_open_private(addr, NULL);
 
         if (!ibus_conn) {
-            return SDL_FALSE; /* oh well. */
+            return SDL_FALSE; // oh well.
         }
 
         dbus->connection_flush(ibus_conn);
@@ -469,7 +469,7 @@ static SDL_bool IBus_SetupConnection(SDL_DBusContext *dbus, const char *addr)
                                                  DBUS_TYPE_STRING, &client_name, DBUS_TYPE_INVALID,
                                                  DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID);
     } else {
-        /* re-using dbus->session_conn */
+        // re-using dbus->session_conn
         dbus->connection_ref(ibus_conn);
     }
 
@@ -584,7 +584,7 @@ SDL_bool SDL_IBus_Init(void)
         result = IBus_SetupConnection(dbus, addr);
         SDL_free(addr);
 
-        /* don't use the addr_file if using the portal interface. */
+        // don't use the addr_file if using the portal interface.
         if (result && ibus_is_portal_interface) {
             if (inotify_fd > 0) {
                 if (inotify_wd > 0) {
@@ -616,7 +616,7 @@ void SDL_IBus_Quit(void)
 
     dbus = SDL_DBus_GetContext();
 
-    /* if using portal, ibus_conn == session_conn; don't release it here. */
+    // if using portal, ibus_conn == session_conn; don't release it here.
     if (dbus && ibus_conn && !ibus_is_portal_interface) {
         dbus->connection_close(ibus_conn);
         dbus->connection_unref(ibus_conn);
@@ -633,7 +633,7 @@ void SDL_IBus_Quit(void)
         inotify_wd = -1;
     }
 
-    /* !!! FIXME: should we close(inotify_fd) here? */
+    // !!! FIXME: should we close(inotify_fd) here?
 
     SDL_DelHintCallback(SDL_HINT_IME_IMPLEMENTED_UI, IBus_SetCapabilities, NULL);
 
@@ -733,7 +733,7 @@ void SDL_IBus_PumpEvents(void)
         dbus->connection_read_write(ibus_conn, 0);
 
         while (dbus->connection_dispatch(ibus_conn) == DBUS_DISPATCH_DATA_REMAINS) {
-            /* Do nothing, actual work happens in IBus_MessageHandler */
+            // Do nothing, actual work happens in IBus_MessageHandler
         }
     }
 }