Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libretro: win32 build fix #625

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/align.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "helpers.hpp"

#ifdef _MSC_VER
#ifdef _WIN32
#include <malloc.h>
#endif

Expand Down Expand Up @@ -77,7 +77,7 @@ namespace Common {
}

ALWAYS_INLINE static void* alignedMalloc(size_t size, size_t alignment) {
#ifdef _MSC_VER
#ifdef _WIN32
return _aligned_malloc(size, alignment);
#else
// Unaligned sizes are slow on macOS.
Expand All @@ -96,4 +96,4 @@ namespace Common {
free(ptr);
#endif
}
} // namespace Common
} // namespace Common
Loading