gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Apple's nomenclature for macOS and iOS

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/6621
This commit is contained in:
Sam Lantinga
2022-11-25 16:00:06 -08:00
parent 5fb3eb9475
commit cc1f9eb983
83 changed files with 291 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/power/SDL_power.c
View File

@@ -56,7 +56,7 @@ static SDL_GetPowerInfo_Impl implementations[] = {
#ifdef SDL_POWER_UIKIT /* handles iPhone/iPad/etc */
SDL_GetPowerInfo_UIKit,
#endif
#ifdef SDL_POWER_MACOSX /* handles Mac OS X, Darwin. */
#ifdef SDL_POWER_MACOSX /* handles macOS, Darwin. */
SDL_GetPowerInfo_MacOSX,
#endif
#ifdef SDL_POWER_HAIKU /* with BeOS euc.jp apm driver. Does this work on Haiku? */

4
src/power/macosx/SDL_syspower.c → src/power/macos/SDL_syspower.c
View File

@@ -89,7 +89,7 @@ checkps(CFDictionaryRef dict, SDL_bool * have_ac, SDL_bool * have_battery,
SInt32 val = -1;
CFNumberGetValue(numval, kCFNumberSInt32Type, &val);
/* Mac OS X reports 0 minutes until empty if you're plugged in. :( */
/* macOS reports 0 minutes until empty if you're plugged in. :( */
if ((val == 0) && (is_ac)) {
val = -1; /* !!! FIXME: calc from timeToFull and capacity? */
}
@@ -183,7 +183,7 @@ SDL_GetPowerInfo_MacOSX(SDL_PowerState * state, int *seconds, int *percent)
CFRelease(blob);
}
return SDL_TRUE; /* always the definitive answer on Mac OS X. */
return SDL_TRUE; /* always the definitive answer on macOS. */
}
#endif /* SDL_POWER_MACOSX */