diff options
| author | Mike Pall <mike> | 2013-03-13 21:59:40 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-03-13 21:59:40 +0100 |
| commit | 3e8f5ac7186ecac63e17688b9ba6e72697143dbb (patch) | |
| tree | 1382ea1d7a929c893c8c6bba16bec5ddd4455ec6 | |
| parent | 7950894d70ac86cf0670f60aed5833c787dabfa6 (diff) | |
| parent | eea48c8b263f4fb294200f394764a6eba1de877a (diff) | |
| download | luajit-3e8f5ac7186ecac63e17688b9ba6e72697143dbb.tar.gz luajit-3e8f5ac7186ecac63e17688b9ba6e72697143dbb.tar.bz2 luajit-3e8f5ac7186ecac63e17688b9ba6e72697143dbb.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lj_def.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lj_def.h b/src/lj_def.h index 83eb67bc..250729f7 100644 --- a/src/lj_def.h +++ b/src/lj_def.h | |||
| @@ -101,8 +101,8 @@ typedef unsigned int uintptr_t; | |||
| 101 | #define checkptr32(x) ((uintptr_t)(x) == (uint32_t)(uintptr_t)(x)) | 101 | #define checkptr32(x) ((uintptr_t)(x) == (uint32_t)(uintptr_t)(x)) |
| 102 | 102 | ||
| 103 | /* Every half-decent C compiler transforms this into a rotate instruction. */ | 103 | /* Every half-decent C compiler transforms this into a rotate instruction. */ |
| 104 | #define lj_rol(x, n) (((x)<<(n)) | ((x)>>(8*sizeof(x)-(n)))) | 104 | #define lj_rol(x, n) (((x)<<(n)) | ((x)>>(-(int)(n)&(8*sizeof(x)-1)))) |
| 105 | #define lj_ror(x, n) (((x)<<(8*sizeof(x)-(n))) | ((x)>>(n))) | 105 | #define lj_ror(x, n) (((x)<<(-(int)(n)&(8*sizeof(x)-1))) | ((x)>>(n))) |
| 106 | 106 | ||
| 107 | /* A really naive Bloom filter. But sufficient for our needs. */ | 107 | /* A really naive Bloom filter. But sufficient for our needs. */ |
| 108 | typedef uintptr_t BloomFilter; | 108 | typedef uintptr_t BloomFilter; |