From cf3a2630443e3522d68c62a184df11ad1914ec44 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Sun, 26 Aug 2012 14:36:00 +0200
Subject: [PATCH] Fix compilation with FFI disabled.

---
 src/lj_asm.c | 4 ++--
 src/lj_lex.c | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/lj_asm.c b/src/lj_asm.c
index 8deddd65..bdc86dd0 100644
--- a/src/lj_asm.c
+++ b/src/lj_asm.c
@@ -808,9 +808,9 @@ static void asm_snap_alloc1(ASMState *as, IRRef ref)
 	asm_snap_alloc1(as, ir->op2);
 	if (LJ_32 && (ir+1)->o == IR_HIOP)
 	  asm_snap_alloc1(as, (ir+1)->op2);
-      }
+      } else
 #endif
-      else {  /* Allocate stored values for TNEW, TDUP and CNEW. */
+      {  /* Allocate stored values for TNEW, TDUP and CNEW. */
 	IRIns *irs;
 	lua_assert(ir->o == IR_TNEW || ir->o == IR_TDUP || ir->o == IR_CNEW);
 	for (irs = IR(as->snapref-1); irs > ir; irs--)
diff --git a/src/lj_lex.c b/src/lj_lex.c
index 55e2bea1..c85ea314 100644
--- a/src/lj_lex.c
+++ b/src/lj_lex.c
@@ -108,7 +108,8 @@ static void lex_number(LexState *ls, TValue *tv)
     setitype(tv, LJ_TISNUM);
   } else if (fmt == STRSCAN_NUM) {
     /* Already in correct format. */
-  } else if (LJ_HASFFI && fmt != STRSCAN_ERROR) {
+#if LJ_HASFFI
+  } else if (fmt != STRSCAN_ERROR) {
     lua_State *L = ls->L;
     GCcdata *cd;
     lua_assert(fmt == STRSCAN_I64 || fmt == STRSCAN_U64 || fmt == STRSCAN_IMAG);
@@ -126,6 +127,7 @@ static void lex_number(LexState *ls, TValue *tv)
       *(uint64_t *)cdataptr(cd) = tv->u64;
     }
     lj_parse_keepcdata(ls, tv, cd);
+#endif
   } else {
     lua_assert(fmt == STRSCAN_ERROR);
     lj_lex_error(ls, TK_number, LJ_ERR_XNUMBER);