Merge branch 'main' into p2p-peer-throttle

AntelopeIO · Sep 7, 2023 · 1983d90 · 1983d90
2 parents 1eb1e44 + 061e79d
commit 1983d90
Show file tree

Hide file tree

Showing 3 changed files with 839 additions and 3 deletions.
diff --git a/libraries/libfc/CMakeLists.txt b/libraries/libfc/CMakeLists.txt
@@ -102,7 +102,7 @@ find_package(ZLIB REQUIRED)
 target_include_directories(fc PUBLIC include)
 
 # try and make this very clear that this json parser is intended only for webauthn parsing..
-set_source_files_properties(src/crypto/elliptic_webauthn.cpp PROPERTIES COMPILE_FLAGS "-I${CMAKE_CURRENT_SOURCE_DIR}/include/fc/crypto/webauthn_json/include")
+set_source_files_properties(src/crypto/elliptic_webauthn.cpp PROPERTIES INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include/fc/crypto/webauthn_json/include")
 
 if(WIN32)
   target_link_libraries( fc PUBLIC ws2_32 mswsock userenv )

diff --git a/libraries/libfc/include/fc/io/cfile.hpp b/libraries/libfc/include/fc/io/cfile.hpp
@@ -19,7 +19,11 @@
 namespace fc {
 
 namespace detail {
-   using unique_file = std::unique_ptr<FILE, decltype( &fclose )>;
+   inline void close_file(FILE* f) noexcept {
+      fclose(f);
+   }
+
+   using unique_file = std::unique_ptr<FILE, decltype( &close_file )>;
 }
 
 class cfile_datastream;
@@ -32,7 +36,7 @@ class cfile {
    friend class temp_cfile;
 public:
    cfile()
-     : _file(nullptr, &fclose)
+     : _file(nullptr, &detail::close_file)
    {}
 
    cfile(cfile&& other)