fix(file): aggressively turn off macros that mess with Win32 filestack

This commit is contained in:
phaneron 2025-03-16 01:54:01 -04:00
parent abd4efb5b5
commit 12b4a4f7b4
5 changed files with 14 additions and 5 deletions

View file

@ -7,6 +7,10 @@
#include <cstdint> #include <cstdint>
#if defined(WHOA_SYSTEM_WIN)
#include "bc/system/file/win/Support.hpp"
#endif
namespace System_File { namespace System_File {
namespace Stacked { namespace Stacked {

View file

@ -1,8 +1,8 @@
#include "bc/system/file/Stacked.hpp"
#include "bc/system/file/System_File.hpp" #include "bc/system/file/System_File.hpp"
#include "bc/Lock.hpp" #include "bc/Lock.hpp"
#include "bc/File.hpp" #include "bc/File.hpp"
#include "bc/String.hpp" #include "bc/String.hpp"
#include "bc/system/file/Stacked.hpp"
#include "bc/system/file/Types.hpp" #include "bc/system/file/Types.hpp"
#if defined(WHOA_SYSTEM_WIN) #if defined(WHOA_SYSTEM_WIN)
@ -10,9 +10,7 @@
#include <minwinbase.h> #include <minwinbase.h>
#include <winnt.h> #include <winnt.h>
#undef CreateDirectory #include "bc/system/file/win/Support.hpp"
#undef RemoveDirectory
#undef GetFreeSpace
#endif #endif
#if defined(WHOA_SYSTEM_MAC) || defined(WHOA_SYSTEM_LINUX) #if defined(WHOA_SYSTEM_MAC) || defined(WHOA_SYSTEM_LINUX)

View file

@ -6,6 +6,10 @@
#include "bc/file/Filesystem.hpp" #include "bc/file/Filesystem.hpp"
#include <cstdint> #include <cstdint>
#if defined(WHOA_SYSTEM_WIN)
#include "bc/system/file/win/Support.hpp"
#endif
namespace System_File { namespace System_File {
extern bool s_EnableFileLocks; extern bool s_EnableFileLocks;

View file

@ -1,5 +1,6 @@
#if defined(WHOA_SYSTEM_WIN) #if defined(WHOA_SYSTEM_WIN)
#include "bc/system/file/Stacked.hpp"
#include "bc/string/QuickFormat.hpp" #include "bc/string/QuickFormat.hpp"
#include "bc/File.hpp" #include "bc/File.hpp"
#include "bc/Debug.hpp" #include "bc/Debug.hpp"
@ -7,7 +8,6 @@
#include "bc/String.hpp" #include "bc/String.hpp"
#include "bc/Unicode.hpp" #include "bc/Unicode.hpp"
#include "bc/File.hpp" #include "bc/File.hpp"
#include "bc/system/file/Stacked.hpp"
#include "bc/time/Time.hpp" #include "bc/time/Time.hpp"
#include <algorithm> #include <algorithm>

View file

@ -0,0 +1,3 @@
#undef GetFreeSpace
#undef CreateDirectory
#undef RemoveDirectory