summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2014-01-20 16:48:33 +0100
committerMike Pall <mike>2014-01-20 16:48:33 +0100
commit3db3cc10ff141c6908edd589ef80b7ebb71cf147 (patch)
treeb290525f8274ddd575e9f16faafc5f0d607f2de5 /src
parent926686ad3ddb51e4c74294854946b085ac50373b (diff)
downloadluajit-3db3cc10ff141c6908edd589ef80b7ebb71cf147.tar.gz
luajit-3db3cc10ff141c6908edd589ef80b7ebb71cf147.tar.bz2
luajit-3db3cc10ff141c6908edd589ef80b7ebb71cf147.zip
Fix compiler warnings.
Diffstat (limited to 'src')
-rw-r--r--src/lib_string.c2
-rw-r--r--src/lj_cconv.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib_string.c b/src/lib_string.c
index a02038e9..9ec6d0c3 100644
--- a/src/lib_string.c
+++ b/src/lib_string.c
@@ -64,7 +64,7 @@ LJLIB_ASM(string_byte) LJLIB_REC(string_range 0)
64LJLIB_ASM(string_char) 64LJLIB_ASM(string_char)
65{ 65{
66 int i, nargs = (int)(L->top - L->base); 66 int i, nargs = (int)(L->top - L->base);
67 char *buf = lj_str_needbuf(L, &G(L)->tmpbuf, (size_t)nargs); 67 char *buf = lj_str_needbuf(L, &G(L)->tmpbuf, (MSize)nargs);
68 for (i = 1; i <= nargs; i++) { 68 for (i = 1; i <= nargs; i++) {
69 int32_t k = lj_lib_checkint(L, i); 69 int32_t k = lj_lib_checkint(L, i);
70 if (!checku8(k)) 70 if (!checku8(k))
diff --git a/src/lj_cconv.h b/src/lj_cconv.h
index 9b96957c..17e0f050 100644
--- a/src/lj_cconv.h
+++ b/src/lj_cconv.h
@@ -29,7 +29,7 @@ static LJ_AINLINE uint32_t cconv_idx(CTInfo info)
29 uint32_t idx = ((info >> 26) & 15u); /* Dispatch bits. */ 29 uint32_t idx = ((info >> 26) & 15u); /* Dispatch bits. */
30 lua_assert(ctype_type(info) <= CT_MAYCONVERT); 30 lua_assert(ctype_type(info) <= CT_MAYCONVERT);
31#if LJ_64 31#if LJ_64
32 idx = ((U64x(f436fff5,fff7f021) >> 4*idx) & 15u); 32 idx = ((uint32_t)(U64x(f436fff5,fff7f021) >> 4*idx) & 15u);
33#else 33#else
34 idx = (((idx < 8 ? 0xfff7f021u : 0xf436fff5) >> 4*(idx & 7u)) & 15u); 34 idx = (((idx < 8 ? 0xfff7f021u : 0xf436fff5) >> 4*(idx & 7u)) & 15u);
35#endif 35#endif