diff options
| author |  bunnei | 2015-02-18 00:12:37 -0500 |
|---|---|---|
| committer | bunnei | 2015-02-18 00:12:37 -0500 |
| commit | 745b42d236873522ee854aa7422f8330eaa86c0e (patch) | |
| tree | cd7be21255658b42e295b6df365c1a74cf70a3aa /src/common | |
| parent | Merge pull request #582 from lioncash/warnings (diff) | |
| parent | ConfigMem: Clean up the Config memory to be more like the shared page and moved (diff) | |
| download | yuzu-745b42d236873522ee854aa7422f8330eaa86c0e.tar.gz yuzu-745b42d236873522ee854aa7422f8330eaa86c0e.tar.xz yuzu-745b42d236873522ee854aa7422f8330eaa86c0e.zip | |
Merge pull request #570 from purpasmart96/config_mem
ConfigMem: Clean up the Config memory to be more like the shared page
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/common_funcs.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 44d8ae11f..4bbcc3571 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h | |||
| @@ -35,6 +35,13 @@ template<> struct CompileTimeAssert<true> {}; | |||
| 35 | #define CONCAT2(x, y) DO_CONCAT2(x, y) | 35 | #define CONCAT2(x, y) DO_CONCAT2(x, y) |
| 36 | #define DO_CONCAT2(x, y) x ## y | 36 | #define DO_CONCAT2(x, y) x ## y |
| 37 | 37 | ||
| 38 | // helper macro to properly align structure members. | ||
| 39 | // Calling INSERT_PADDING_BYTES will add a new member variable with a name like "pad121", | ||
| 40 | // depending on the current source line to make sure variable names are unique. | ||
| 41 | #define INSERT_PADDING_BYTES_HELPER1(x, y) x ## y | ||
| 42 | #define INSERT_PADDING_BYTES_HELPER2(x, y) INSERT_PADDING_BYTES_HELPER1(x, y) | ||
| 43 | #define INSERT_PADDING_BYTES(num_words) u8 INSERT_PADDING_BYTES_HELPER2(pad, __LINE__)[(num_words)] | ||
| 44 | |||
| 38 | #ifndef _MSC_VER | 45 | #ifndef _MSC_VER |
| 39 | 46 | ||
| 40 | #include <errno.h> | 47 | #include <errno.h> |