Skip to content

Commit f7a1812

Browse files
authored
Merge pull request #175 from cscd98/webos-fix
webOS: fix std::aligned_alloc build error and extra param to sys:error
2 parents 6562e40 + 717dc0d commit f7a1812

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/libipc/mem/new_delete_resource.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void *new_delete_resource::allocate(std::size_t bytes, std::size_t alignment) no
3636
log.error("invalid bytes = ", bytes, ", alignment = ", alignment);
3737
return nullptr;
3838
}
39-
#if defined(LIBIPC_CPP_17) && !defined(LIBIPC_CC_MSVC) && !defined(__MINGW32__)
39+
#if defined(LIBIPC_CPP_17) && !defined(LIBIPC_CC_MSVC) && !defined(__MINGW32__) && !defined(__WEBOS__)
4040
/// \see https://en.cppreference.com/w/cpp/memory/c/aligned_alloc
4141
/// \remark The size parameter must be an integral multiple of alignment.
4242
return std::aligned_alloc(alignment, ipc::round_up(bytes, alignment));
@@ -55,7 +55,7 @@ void *new_delete_resource::allocate(std::size_t bytes, std::size_t alignment) no
5555
if (ret != 0) {
5656
log.error("failed: posix_memalign(alignment = ", alignment,
5757
", bytes = ", bytes,
58-
"). error = ", sys::error(ret));
58+
"). error = ", sys::error());
5959
return nullptr;
6060
}
6161
return p;

0 commit comments

Comments
 (0)