diff options
| author | archshift <admin@archshift.com> | 2015-02-19 07:45:46 +0100 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2015-02-20 07:26:25 +0100 |
| commit | 302f0b32f57655dc453d34d30a90a0f06601082a (patch) | |
| tree | 61162e01f93738a587f499a78f01545fa03e258f /src/common | |
| parent | Remove "super lame/broken" file_search compilation unit that was leftover from Dolphin (diff) | |
| download | yuzu-302f0b32f57655dc453d34d30a90a0f06601082a.tar yuzu-302f0b32f57655dc453d34d30a90a0f06601082a.tar.gz yuzu-302f0b32f57655dc453d34d30a90a0f06601082a.tar.bz2 yuzu-302f0b32f57655dc453d34d30a90a0f06601082a.tar.lz yuzu-302f0b32f57655dc453d34d30a90a0f06601082a.tar.xz yuzu-302f0b32f57655dc453d34d30a90a0f06601082a.tar.zst yuzu-302f0b32f57655dc453d34d30a90a0f06601082a.zip | |
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/common_funcs.h | 5 | ||||
| -rw-r--r-- | src/common/hash.cpp | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 4bbcc3571..daec8f0ff 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -38,9 +38,8 @@ template<> struct CompileTimeAssert<true> {}; // helper macro to properly align structure members. // Calling INSERT_PADDING_BYTES will add a new member variable with a name like "pad121", // depending on the current source line to make sure variable names are unique. -#define INSERT_PADDING_BYTES_HELPER1(x, y) x ## y -#define INSERT_PADDING_BYTES_HELPER2(x, y) INSERT_PADDING_BYTES_HELPER1(x, y) -#define INSERT_PADDING_BYTES(num_words) u8 INSERT_PADDING_BYTES_HELPER2(pad, __LINE__)[(num_words)] +#define INSERT_PADDING_BYTES(num_bytes) u8 CONCAT2(pad, __LINE__)[(num_bytes)] +#define INSERT_PADDING_WORDS(num_words) u32 CONCAT2(pad, __LINE__)[(num_words)] #ifndef _MSC_VER diff --git a/src/common/hash.cpp b/src/common/hash.cpp index fe2c9e636..50c7cb5f9 100644 --- a/src/common/hash.cpp +++ b/src/common/hash.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <algorithm> #include "common/hash.h" #if _M_SSE >= 0x402 |