From 663c89ac53847b817a7a9c6cbb3f9bdcc21d812a Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Fri, 18 Oct 2024 14:30:13 -0500 Subject: [PATCH] refactor --- repertory/librepertory/include/platform/platform.hpp | 9 ++++++--- repertory/librepertory/src/file_manager/upload.cpp | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/repertory/librepertory/include/platform/platform.hpp b/repertory/librepertory/include/platform/platform.hpp index 208ebcbb..bc2a87d1 100644 --- a/repertory/librepertory/include/platform/platform.hpp +++ b/repertory/librepertory/include/platform/platform.hpp @@ -22,11 +22,14 @@ #ifndef REPERTORY_INCLUDE_PLATFORM_PLATFORM_HPP_ #define REPERTORY_INCLUDE_PLATFORM_PLATFORM_HPP_ -#include "platform/unix_platform.hpp" +#if defined(_WIN32) #include "platform/win32_platform.hpp" -#include "utils/unix.hpp" -#include "utils/unix/unix_utils.hpp" #include "utils/windows.hpp" #include "utils/windows/windows_utils.hpp" +#else // !defined(_WIN32) +#include "platform/unix_platform.hpp" +#include "utils/unix.hpp" +#include "utils/unix/unix_utils.hpp" +#endif // defined(_WIN32) #endif // REPERTORY_INCLUDE_PLATFORM_PLATFORM_HPP_ diff --git a/repertory/librepertory/src/file_manager/upload.cpp b/repertory/librepertory/src/file_manager/upload.cpp index 9b26723b..86107a9c 100644 --- a/repertory/librepertory/src/file_manager/upload.cpp +++ b/repertory/librepertory/src/file_manager/upload.cpp @@ -23,10 +23,10 @@ #include "events/event_system.hpp" #include "file_manager/events.hpp" +#include "platform/platform.hpp" #include "providers/i_provider.hpp" #include "utils/error_utils.hpp" #include "utils/file_utils.hpp" -#include "utils/platform.hpp" namespace repertory { upload::upload(filesystem_item fsi, i_provider &provider)