diff options
| author | Mike Pall <mike> | 2014-04-08 16:55:54 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-04-08 16:55:54 +0200 |
| commit | 27c453e8e8aa048b7e4f5974f395822e1fa4c0ff (patch) | |
| tree | 846c2a49e7eb674615e0718cbf812acae12b396a /src/lj_carith.c | |
| parent | 347b49ec7d3d8f1a2c771c15ad080960af842f56 (diff) | |
| parent | cc5075e845368538e239a64a34a68c702fbf529d (diff) | |
| download | luajit-27c453e8e8aa048b7e4f5974f395822e1fa4c0ff.tar.gz luajit-27c453e8e8aa048b7e4f5974f395822e1fa4c0ff.tar.bz2 luajit-27c453e8e8aa048b7e4f5974f395822e1fa4c0ff.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_carith.c')
| -rw-r--r-- | src/lj_carith.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_carith.c b/src/lj_carith.c index 53257e18..f675bf5e 100644 --- a/src/lj_carith.c +++ b/src/lj_carith.c | |||
| @@ -81,7 +81,7 @@ static int carith_checkarg(lua_State *L, CTState *cts, CDArith *ca) | |||
| 81 | } | 81 | } |
| 82 | } else { | 82 | } else { |
| 83 | ca->ct[i] = NULL; | 83 | ca->ct[i] = NULL; |
| 84 | ca->p[i] = NULL; | 84 | ca->p[i] = (void *)(intptr_t)1; /* To make it unequal. */ |
| 85 | ok = 0; | 85 | ok = 0; |
| 86 | } | 86 | } |
| 87 | } | 87 | } |