diff options
| author |  Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-09 18:16:46 -0300 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-09 18:16:46 -0300 |
| commit | b700b5569605d9d73bf5ee5f3ede020ac242f7f1 (patch) | |
| tree | ef59beed796898ff36e3da1e2c3395e1f841053d /src | |
| parent | e35e72d0a5c90c37d22328115fa0f29dd17aeaee (diff) | |
Common: Remove the BIT macro
When the macro was introduced in 326ec51261299e48de97592631c02523da9c8118
it wasn't noticed that it conflicted in name with a heavily used macro
inside of dyncom. This causes some compiler warnings. Since it's only
lightly used, it was opted to simply remove the new macro.
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/common_funcs.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index fde0f3a5..91b74c6b 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -15,8 +15,6 @@ #define b32(x) (b16(x) | (b16(x) >>16) ) #define ROUND_UP_POW2(x) (b32(x - 1) + 1) -#define BIT(x) (1U << (x)) - #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) /// Textually concatenates two tokens. The double-expansion is required by the C preprocessor. diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index a444e22e..26a9c236 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -62,8 +62,8 @@ void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) { AddressMapping mapping; mapping.address = descriptor << 12; mapping.size = (end_desc << 12) - mapping.address; - mapping.writable = descriptor & BIT(20); - mapping.unk_flag = end_desc & BIT(20); + mapping.writable = descriptor & (1 << 20); + mapping.unk_flag = end_desc & (1 << 20); address_mappings.push_back(mapping); } else if ((type & 0xFFF) == 0xFFE) { // 0x000F |