eden-emu/SDL
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename functions in SDL_system.h to match SDL 3.0 naming convention

Browse source 
Fixes https://github.com/libsdl-org/SDL/issues/10277
This commit is contained in:
Sam Lantinga 2024-07-15 16:13:23 -07:00
parent e38f971f46
commit 54366181c3
32 changed files with 252 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/filesystem/winrt/SDL_sysfilesystem.cpp
View file

@ -35,7 +35,7 @@ extern "C" {
using namespace std;
using namespace Windows::Storage;
static const wchar_t *SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path pathType)
static const wchar_t *SDL_GetWinRTFSPathUNICODE(SDL_WinRT_Path pathType)
{
switch (pathType) {
case SDL_WINRT_PATH_INSTALLED_LOCATION:
@ -94,7 +94,7 @@ static const wchar_t *SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path pathType)
}
// this caches a string until the process ends, so there's no need to use SDL_FreeLater.
extern "C" const char *SDL_WinRTGetFSPath(SDL_WinRT_Path pathType)
extern "C" const char *SDL_GetWinRTFSPath(SDL_WinRT_Path pathType)
{
typedef unordered_map<SDL_WinRT_Path, string> UTF8PathMap;
static UTF8PathMap utf8Paths;
@ -104,7 +104,7 @@ extern "C" const char *SDL_WinRTGetFSPath(SDL_WinRT_Path pathType)
return searchResult->second.c_str();
}
const wchar_t *ucs2Path = SDL_WinRTGetFSPathUNICODE(pathType);
const wchar_t *ucs2Path = SDL_GetWinRTFSPathUNICODE(pathType);
if (!ucs2Path) {
return NULL;
}
@ -117,7 +117,7 @@ extern "C" const char *SDL_WinRTGetFSPath(SDL_WinRT_Path pathType)
extern "C" char *SDL_GetBasePath(void)
{
const char *srcPath = SDL_WinRTGetFSPath(SDL_WINRT_PATH_INSTALLED_LOCATION);
const char *srcPath = SDL_GetWinRTFSPath(SDL_WINRT_PATH_INSTALLED_LOCATION);
size_t destPathLen;
char *destPath = NULL;
@ -160,7 +160,7 @@ extern "C" char *SDL_GetPrefPath(const char *org, const char *app)
org = "";
}
srcPath = SDL_WinRTGetFSPathUNICODE(SDL_WINRT_PATH_LOCAL_FOLDER);
srcPath = SDL_GetWinRTFSPathUNICODE(SDL_WINRT_PATH_LOCAL_FOLDER);
if (!srcPath) {
SDL_SetError("Unable to find a source path");
return NULL;