Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2014-04-08 16:55:54 +02:00
commit 27c453e8e8

View File

@ -81,7 +81,7 @@ static int carith_checkarg(lua_State *L, CTState *cts, CDArith *ca)
} }
} else { } else {
ca->ct[i] = NULL; ca->ct[i] = NULL;
ca->p[i] = NULL; ca->p[i] = (void *)(intptr_t)1; /* To make it unequal. */
ok = 0; ok = 0;
} }
} }