diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2022-09-09 12:54:58 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2022-09-09 12:54:58 -0500 |
| commit | 4b6a3fbaa0c1f36ad2d8e67c2dba25e2cedbd016 (patch) | |
| tree | 72cf38963669670abea1a77c278466eca057b6f9 | |
| parent | Merge pull request #8534 (diff) | |
| parent | Windows: fix unicode file path support (diff) | |
| download | monero-4b6a3fbaa0c1f36ad2d8e67c2dba25e2cedbd016.tar.xz | |
Merge pull request #8548
3679925 Windows: fix unicode file path support (tobtoht)
| -rw-r--r-- | contrib/epee/src/file_io_utils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/epee/src/file_io_utils.cpp b/contrib/epee/src/file_io_utils.cpp index a8348431c..c0798a510 100644 --- a/contrib/epee/src/file_io_utils.cpp +++ b/contrib/epee/src/file_io_utils.cpp @@ -29,7 +29,7 @@ #include <fstream> #include <boost/filesystem/path.hpp> #include <boost/filesystem/operations.hpp> -#ifdef WIN32 +#ifdef _WIN32 #include <windows.h> #include "string_tools.h" #endif @@ -70,7 +70,7 @@ namespace file_io_utils bool save_string_to_file(const std::string& path_to_file, const std::string& str) { -#ifdef WIN32 +#ifdef _WIN32 std::wstring wide_path; try { wide_path = string_tools::utf8_to_utf16(path_to_file); } catch (...) { return false; } HANDLE file_handle = CreateFileW(wide_path.c_str(), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -104,7 +104,7 @@ namespace file_io_utils bool load_file_to_string(const std::string& path_to_file, std::string& target_str, size_t max_size) { -#ifdef WIN32 +#ifdef _WIN32 std::wstring wide_path; try { wide_path = string_tools::utf8_to_utf16(path_to_file); } catch (...) { return false; } HANDLE file_handle = CreateFileW(wide_path.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -153,7 +153,7 @@ namespace file_io_utils bool get_file_size(const std::string& path_to_file, uint64_t &size) { -#ifdef WIN32 +#ifdef _WIN32 std::wstring wide_path; try { wide_path = string_tools::utf8_to_utf16(path_to_file); } catch (...) { return false; } HANDLE file_handle = CreateFileW(wide_path.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); |