diff options
| author | Richard Brooksby | 2012-05-01 17:24:01 +0100 |
|---|---|---|
| committer | Richard Brooksby | 2012-05-01 17:24:01 +0100 |
| commit | 280386e6acfe6c93fef7dd90fc6cd4f00feee4fe (patch) | |
| tree | 2ece4b71e35c55b8bea468e5acc171b8318b112e /mps/code | |
| parent | e9692d8c0a9ea691b4dfd1762fbec09bfe39a458 (diff) | |
| download | emacs-280386e6acfe6c93fef7dd90fc6cd4f00feee4fe.tar.gz emacs-280386e6acfe6c93fef7dd90fc6cd4f00feee4fe.zip | |
Fixing a "1ul" constant to "(mps_word_t)1" since 1ul isn't 64-bits wide on windows 64.
Copied from Perforce
Change: 178080
ServerID: perforce.ravenbrook.com
Diffstat (limited to 'mps/code')
| -rw-r--r-- | mps/code/mps.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mps/code/mps.h b/mps/code/mps.h index 7d08be71906..427d9ccba94 100644 --- a/mps/code/mps.h +++ b/mps/code/mps.h | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #ifndef MPS_T_WORD | 25 | #ifndef MPS_T_WORD |
| 26 | #if if defined(_MSC_VER) && defined(_WIN32) && defined(_WIN64) && defined(_M_X64) | 26 | #if defined(_MSC_VER) && defined(_WIN32) && defined(_WIN64) && defined(_M_X64) |
| 27 | #define MPS_T_WORD unsigned __int64 | 27 | #define MPS_T_WORD unsigned __int64 |
| 28 | #else | 28 | #else |
| 29 | #define MPS_T_WORD unsigned long /* won't be true on W3I6MV */ | 29 | #define MPS_T_WORD unsigned long /* won't be true on W3I6MV */ |
| @@ -641,8 +641,8 @@ extern mps_res_t mps_fix(mps_ss_t, mps_addr_t *); | |||
| 641 | { | 641 | { |
| 642 | 642 | ||
| 643 | #define MPS_FIX1(ss, ref) \ | 643 | #define MPS_FIX1(ss, ref) \ |
| 644 | (_mps_wt = 1uL << ((mps_word_t)(ref) >> _mps_w0 \ | 644 | (_mps_wt = (mps_word_t)1 << ((mps_word_t)(ref) >> _mps_w0 \ |
| 645 | & (sizeof(mps_word_t) * CHAR_BIT - 1)), \ | 645 | & (sizeof(mps_word_t) * CHAR_BIT - 1)), \ |
| 646 | _mps_w2 |= _mps_wt, \ | 646 | _mps_w2 |= _mps_wt, \ |
| 647 | _mps_w1 & _mps_wt) | 647 | _mps_w1 & _mps_wt) |
| 648 | 648 | ||