From 302f0b32f57655dc453d34d30a90a0f06601082a Mon Sep 17 00:00:00 2001 From: archshift Date: Wed, 18 Feb 2015 22:45:46 -0800 Subject: Remove duplication of INSERT_PADDING_WORDS between pica.h and gpu.h --- src/common/common_funcs.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/common/common_funcs.h') diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 4bbcc357..daec8f0f 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -38,9 +38,8 @@ template<> struct CompileTimeAssert {}; // 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 -- cgit v1.2.3