From 5cc15fac31a7a79c50ce1cd99a31323119f9723d Mon Sep 17 00:00:00 2001 From: orignal Date: Fri, 30 Aug 2024 15:03:50 -0400 Subject: [PATCH] rollback --- Makefile.mingw | 1 + libi2pd/FS.h | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.mingw b/Makefile.mingw index 8db38e8f..4a9d033b 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -18,6 +18,7 @@ endif LDLIBS += \ $(MINGW_PREFIX)/lib/libboost_system-mt.a \ + $(MINGW_PREFIX)/lib/libboost_filesystem-mt.a \ $(MINGW_PREFIX)/lib/libboost_program_options-mt.a \ $(MINGW_PREFIX)/lib/libssl.a \ $(MINGW_PREFIX)/lib/libcrypto.a \ diff --git a/libi2pd/FS.h b/libi2pd/FS.h index 987e0aa9..45155451 100644 --- a/libi2pd/FS.h +++ b/libi2pd/FS.h @@ -16,12 +16,13 @@ #include #ifndef STD_FILESYSTEM -#if __cplusplus >= 201703L // C++ 17 or higher -#include -#if (!defined(MAC_OSX) && !TARGET_OS_SIMULATOR && defined(__cpp_lib_filesystem)) // supports std::filesystem +#if (!defined(MAC_OSX) && !TARGET_OS_SIMULATOR && \ + (__cplusplus >= 201703L) && defined(__cpp_lib_filesystem)) // C++ 17 or higher supporting std::filesystem # define STD_FILESYSTEM 1 +#else +# define STD_FILESYSTEM 0 #endif -#endif + #endif namespace i2p {