diff options
| author | maerean <mmaerean@adobe.com> | 2012-07-19 18:57:19 +0400 |
|---|---|---|
| committer | maerean <mmaerean@adobe.com> | 2012-07-19 18:57:19 +0400 |
| commit | 34048d938af230c2c801e02d6c312f856ac4150a (patch) | |
| tree | 8dad4bb6bf754449af6ab363f8c097f77a6222ba | |
| parent | 4b16cfa212dc105d7a9a77637ebb795219fba998 (diff) | |
Fix the compile time warning when building Chromium for 64 bits:
chromium/trunk/src/third_party/mach_override/mach_override.c:374:59:{374:25-374:97}{374:98-374:99}: error: '&' within '|' [-Werror,-Wbitwise-op-parentheses]
vm_address_t first = (uint64_t)originalFunctionAddress & ~(uint64_t)(((uint64_t)1 << 31) - 1) | ((uint64_t)1 << 31); // start in the middle of the page?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~
chromium/trunk/src/third_party/mach_override/mach_override.c:374:59: note: place parentheses around the '&' expression to silence this warning
| -rw-r--r-- | mach_override/mach_override.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mach_override/mach_override.c b/mach_override/mach_override.c index 6841ab8..64dd0ab 100644 --- a/mach_override/mach_override.c +++ b/mach_override/mach_override.c @@ -393,7 +393,7 @@ allocateBranchIsland( vm_address_t first = 0xfeffffff; vm_address_t last = 0xfe000000 + pageSize; #elif defined(__x86_64__) - vm_address_t first = (uint64_t)originalFunctionAddress & ~(uint64_t)(((uint64_t)1 << 31) - 1) | ((uint64_t)1 << 31); // start in the middle of the page? + vm_address_t first = ((uint64_t)originalFunctionAddress & ~(uint64_t)(((uint64_t)1 << 31) - 1)) | ((uint64_t)1 << 31); // start in the middle of the page? vm_address_t last = 0x0; #else vm_address_t first = 0xffc00000; |