aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2019-12-08 19:42:49 +0100
committerMike Pall <mike>2019-12-08 19:42:49 +0100
commit41a25efc80bf7b33b2f52a6602a1a82bbe969f1d (patch)
tree950b337c5d892ad010b8c65af77bd5ce468bff6f
parent46a1b268eb0534182eda0447303c344a071632fe (diff)
downloadluajit-41a25efc80bf7b33b2f52a6602a1a82bbe969f1d.tar.gz
luajit-41a25efc80bf7b33b2f52a6602a1a82bbe969f1d.tar.bz2
luajit-41a25efc80bf7b33b2f52a6602a1a82bbe969f1d.zip
Fix declarations of _BitScanForward/_BitScanReverse.
Reported by Mumin Guler.
-rw-r--r--src/lj_def.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lj_def.h b/src/lj_def.h
index c7600d33..e9249e0d 100644
--- a/src/lj_def.h
+++ b/src/lj_def.h
@@ -254,19 +254,19 @@ static LJ_AINLINE uint32_t lj_fls(uint32_t x)
254 return _CountLeadingZeros(x) ^ 31; 254 return _CountLeadingZeros(x) ^ 31;
255} 255}
256#else 256#else
257unsigned char _BitScanForward(uint32_t *, unsigned long); 257unsigned char _BitScanForward(unsigned long *, unsigned long);
258unsigned char _BitScanReverse(uint32_t *, unsigned long); 258unsigned char _BitScanReverse(unsigned long *, unsigned long);
259#pragma intrinsic(_BitScanForward) 259#pragma intrinsic(_BitScanForward)
260#pragma intrinsic(_BitScanReverse) 260#pragma intrinsic(_BitScanReverse)
261 261
262static LJ_AINLINE uint32_t lj_ffs(uint32_t x) 262static LJ_AINLINE uint32_t lj_ffs(uint32_t x)
263{ 263{
264 uint32_t r; _BitScanForward(&r, x); return r; 264 unsigned long r; _BitScanForward(&r, x); return (uint32_t)r;
265} 265}
266 266
267static LJ_AINLINE uint32_t lj_fls(uint32_t x) 267static LJ_AINLINE uint32_t lj_fls(uint32_t x)
268{ 268{
269 uint32_t r; _BitScanReverse(&r, x); return r; 269 unsigned long r; _BitScanReverse(&r, x); return (uint32_t)r;
270} 270}
271#endif 271#endif
272 272