diff options
| author | archshift <admin@archshift.com> | 2015-02-18 22:45:46 -0800 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2015-02-19 22:26:25 -0800 |
| commit | 302f0b32f57655dc453d34d30a90a0f06601082a (patch) | |
| tree | 61162e01f93738a587f499a78f01545fa03e258f /src/common/common_funcs.h | |
| parent | 49f94b82b4a9431c0db7327038695790bafdfd31 (diff) | |
Remove duplication of INSERT_PADDING_WORDS between pica.h and gpu.h
Diffstat (limited to 'src/common/common_funcs.h')
| -rw-r--r-- | src/common/common_funcs.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 4bbcc35717..daec8f0ffd 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 |