From 86aa3fe8ac6bf13365e55b85829759e1bd2b8bf8 Mon Sep 17 00:00:00 2001 From: Vladislav Mikhalin Date: Thu, 11 Jul 2024 12:57:34 +0300 Subject: [PATCH] Fixed build for POSIX --- src/common/io_file.cpp | 4 ++-- src/common/io_file.h | 6 +++--- src/core/libraries/kernel/libkernel.cpp | 2 +- src/core/libraries/kernel/libkernel.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/common/io_file.cpp b/src/common/io_file.cpp index 3a0901548..1148b29c7 100644 --- a/src/common/io_file.cpp +++ b/src/common/io_file.cpp @@ -167,7 +167,7 @@ IOFile& IOFile::operator=(IOFile&& other) noexcept { return *this; } -errno_t IOFile::Open(const fs::path& path, FileAccessMode mode, FileType type, FileShareFlag flag) { +int IOFile::Open(const fs::path& path, FileAccessMode mode, FileType type, FileShareFlag flag) { Close(); file_path = path; @@ -175,7 +175,7 @@ errno_t IOFile::Open(const fs::path& path, FileAccessMode mode, FileType type, F file_type = type; errno = 0; - errno_t result = 0; + int result = 0; #ifdef _WIN32 if (flag != FileShareFlag::ShareNone) { diff --git a/src/common/io_file.h b/src/common/io_file.h index b55cc134e..778a42b45 100644 --- a/src/common/io_file.h +++ b/src/common/io_file.h @@ -102,9 +102,9 @@ public: uintptr_t GetFileMapping(); - errno_t Open(const std::filesystem::path& path, FileAccessMode mode, - FileType type = FileType::BinaryFile, - FileShareFlag flag = FileShareFlag::ShareReadOnly); + int Open(const std::filesystem::path& path, FileAccessMode mode, + FileType type = FileType::BinaryFile, + FileShareFlag flag = FileShareFlag::ShareReadOnly); void Close(); bool Flush() const; diff --git a/src/core/libraries/kernel/libkernel.cpp b/src/core/libraries/kernel/libkernel.cpp index a41d4ef0c..fffe8e180 100644 --- a/src/core/libraries/kernel/libkernel.cpp +++ b/src/core/libraries/kernel/libkernel.cpp @@ -75,7 +75,7 @@ void ErrSceToPosix(int result) { g_posix_errno = rt; } -int ErrnoToSceKernelError(errno_t e) { +int ErrnoToSceKernelError(int e) { const auto res = SCE_KERNEL_ERROR_UNKNOWN + e; return res > SCE_KERNEL_ERROR_ESTOP ? SCE_KERNEL_ERROR_UNKNOWN : res; } diff --git a/src/core/libraries/kernel/libkernel.h b/src/core/libraries/kernel/libkernel.h index a99ffba8a..5b22dea4b 100644 --- a/src/core/libraries/kernel/libkernel.h +++ b/src/core/libraries/kernel/libkernel.h @@ -13,7 +13,7 @@ class SymbolsResolver; namespace Libraries::Kernel { void ErrSceToPosix(int result); -int ErrnoToSceKernelError(errno_t e); +int ErrnoToSceKernelError(int e); struct OrbisTimesec { time_t t;