From 89199f4d279bff0c664fb9142b1945d0c6d93ee8 Mon Sep 17 00:00:00 2001 From: lizzie Date: Thu, 4 Jun 2026 05:49:07 +0200 Subject: [*] basic in-house cpp linting (#4039) - add `#pragma once` to remainder files - "correcter" defines (ANDROID), see https://groups.google.com/g/android-ndk/c/cf9_f1SLXls - extra miscelly fixups Signed-off-by: lizzie Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4039 Reviewed-by: MaranBr Reviewed-by: crueter --- src/common/fs/path_util.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/common/fs/path_util.cpp') diff --git a/src/common/fs/path_util.cpp b/src/common/fs/path_util.cpp index 714e393293..93d2300ed1 100644 --- a/src/common/fs/path_util.cpp +++ b/src/common/fs/path_util.cpp @@ -11,7 +11,7 @@ #include "common/assert.h" #include "common/fs/fs.h" -#ifdef ANDROID +#ifdef __ANDROID__ #include "common/fs/fs_android.h" #endif #include "common/fs/fs_paths.h" @@ -126,7 +126,7 @@ public: LEGACY_PATH(Yuzu, YUZU) LEGACY_PATH(Suyu, SUYU) #undef LEGACY_PATH -#elif ANDROID +#elif __ANDROID__ ASSERT(!eden_path.empty()); eden_path_cache = eden_path / CACHE_DIR; eden_path_config = eden_path / CONFIG_DIR; @@ -447,11 +447,11 @@ std::vector SplitPathComponentsCopy(std::string_view filename) { std::string SanitizePath(std::string_view path_, DirectorySeparator directory_separator) { std::string path(path_); -#ifdef ANDROID +#ifdef __ANDROID__ if (Android::IsContentUri(path)) { return path; } -#endif // ANDROID +#endif // __ANDROID__ char type1 = directory_separator == DirectorySeparator::BackwardSlash ? '/' : '\\'; char type2 = directory_separator == DirectorySeparator::BackwardSlash ? '\\' : '/'; @@ -482,7 +482,7 @@ std::string GetParentPath(std::string_view path) { return std::string(path); } -#ifdef ANDROID +#ifdef __ANDROID__ if (path[0] != '/') { std::string path_string{path}; return FS::Android::GetParentDirectory(path_string); -- cgit v1.2.3