Merge pull request #172 from cscd98/mingw-fixes-latest

mutouyun · web-flow · commit 6562e40453d7 · 2026-01-23T10:25:42.000+08:00
Fix compilation under MINGW
diff --git a/src/libipc/mem/new_delete_resource.cpp b/src/libipc/mem/new_delete_resource.cpp
@@ -36,7 +36,7 @@ void *new_delete_resource::allocate(std::size_t bytes, std::size_t alignment) no
     log.error("invalid bytes = ", bytes, ", alignment = ", alignment);
     return nullptr;
   }
-#if defined(LIBIPC_CPP_17) && !defined(LIBIPC_CC_MSVC)
+#if defined(LIBIPC_CPP_17) && !defined(LIBIPC_CC_MSVC) && !defined(__MINGW32__)
   /// \see https://en.cppreference.com/w/cpp/memory/c/aligned_alloc
   /// \remark The size parameter must be an integral multiple of alignment.
   return std::aligned_alloc(alignment, ipc::round_up(bytes, alignment));

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ void *new_delete_resource::allocate(std::size_t bytes, std::size_t alignment) no`
`36`	`36`	`log.error("invalid bytes = ", bytes, ", alignment = ", alignment);`
`37`	`37`	`return nullptr;`
`38`	`38`	`}`
`39`		`-#if defined(LIBIPC_CPP_17) && !defined(LIBIPC_CC_MSVC)`
	`39`	`+#if defined(LIBIPC_CPP_17) && !defined(LIBIPC_CC_MSVC) && !defined(__MINGW32__)`
`40`	`40`	`/// \see https://en.cppreference.com/w/cpp/memory/c/aligned_alloc`
`41`	`41`	`/// \remark The size parameter must be an integral multiple of alignment.`
`42`	`42`	`return std::aligned_alloc(alignment, ipc::round_up(bytes, alignment));`