summaryrefslogtreecommitdiff
path: root/src/lj_cconv.c
diff options
context:
space:
mode:
authorMike Pall <mike>2012-07-09 16:02:05 +0200
committerMike Pall <mike>2012-07-09 16:02:05 +0200
commitf20ff8a30dbec50bc20b47702c4c61c08f67bd5b (patch)
tree24829aa879eeaf94ecaa2d6dfe2bc53357a01562 /src/lj_cconv.c
parent6e4d0fdc8e8121fac45d85661c638093fbfd1e3a (diff)
downloadluajit-f20ff8a30dbec50bc20b47702c4c61c08f67bd5b.tar.gz
luajit-f20ff8a30dbec50bc20b47702c4c61c08f67bd5b.tar.bz2
luajit-f20ff8a30dbec50bc20b47702c4c61c08f67bd5b.zip
Avoid compiler warnings about redefined C++ keywords.
Diffstat (limited to 'src/lj_cconv.c')
-rw-r--r--src/lj_cconv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_cconv.c b/src/lj_cconv.c
index 97091d08..9964f8a4 100644
--- a/src/lj_cconv.c
+++ b/src/lj_cconv.c
@@ -38,7 +38,7 @@ LJ_NORET static void cconv_err_convtv(CTState *cts, CType *d, TValue *o,
38 CTInfo flags) 38 CTInfo flags)
39{ 39{
40 const char *dst = strdata(lj_ctype_repr(cts->L, ctype_typeid(cts, d), NULL)); 40 const char *dst = strdata(lj_ctype_repr(cts->L, ctype_typeid(cts, d), NULL));
41 const char *src = typename(o); 41 const char *src = lj_typename(o);
42 if (CCF_GETARG(flags)) 42 if (CCF_GETARG(flags))
43 lj_err_argv(cts->L, CCF_GETARG(flags), LJ_ERR_FFI_BADCONV, src, dst); 43 lj_err_argv(cts->L, CCF_GETARG(flags), LJ_ERR_FFI_BADCONV, src, dst);
44 else 44 else