diff options
| author | 2015-05-09 18:16:46 -0300 | |
|---|---|---|
| committer | 2015-05-09 18:16:46 -0300 | |
| commit | b700b5569605d9d73bf5ee5f3ede020ac242f7f1 (patch) | |
| tree | ef59beed796898ff36e3da1e2c3395e1f841053d /src/core/hle/kernel/process.cpp | |
| parent | Merge pull request #734 from yuriks/memmap (diff) | |
| download | yuzu-b700b5569605d9d73bf5ee5f3ede020ac242f7f1.tar.gz yuzu-b700b5569605d9d73bf5ee5f3ede020ac242f7f1.tar.xz yuzu-b700b5569605d9d73bf5ee5f3ede020ac242f7f1.zip | |
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/core/hle/kernel/process.cpp')
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index a444e22e5..26a9c2360 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) { | |||
| 62 | AddressMapping mapping; | 62 | AddressMapping mapping; |
| 63 | mapping.address = descriptor << 12; | 63 | mapping.address = descriptor << 12; |
| 64 | mapping.size = (end_desc << 12) - mapping.address; | 64 | mapping.size = (end_desc << 12) - mapping.address; |
| 65 | mapping.writable = descriptor & BIT(20); | 65 | mapping.writable = descriptor & (1 << 20); |
| 66 | mapping.unk_flag = end_desc & BIT(20); | 66 | mapping.unk_flag = end_desc & (1 << 20); |
| 67 | 67 | ||
| 68 | address_mappings.push_back(mapping); | 68 | address_mappings.push_back(mapping); |
| 69 | } else if ((type & 0xFFF) == 0xFFE) { // 0x000F | 69 | } else if ((type & 0xFFF) == 0xFFE) { // 0x000F |