From b700b5569605d9d73bf5ee5f3ede020ac242f7f1 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sat, 9 May 2015 18:16:46 -0300 Subject: 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. --- src/core/hle/kernel/process.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/hle') 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) { 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 -- cgit v1.2.3