From 26264c25a5d22865ab459ef26f86f7d8dfe88f1e Mon Sep 17 00:00:00 2001
From: Joshua Haberman <joshua@reverberate.org>
Date: Sun, 27 Feb 2011 13:55:47 -0800
Subject: Don't require NASM to build unless using the x64 decoder.

---
 src/upb_decoder.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/upb_decoder.c b/src/upb_decoder.c
index f028297..dc5dafd 100644
--- a/src/upb_decoder.c
+++ b/src/upb_decoder.c
@@ -248,14 +248,13 @@ void upb_decoder_run(upb_src *src, upb_status *status) {
 
     // Decodes as many fields as possible, updating d->ptr appropriately,
     // before falling through to the slow(er) path.
-#ifdef USE_ASSEMBLY_FASTPATH
+#ifdef USE_X64_FASTPATH
     const char *end = UPB_MIN(d->end, d->submsg_end);
     fastdecode_ret ret = upb_fastdecode(d->ptr, end,
                                         d->dispatcher.top->handlers.set->value,
                                         d->dispatcher.top->handlers.closure,
                                         d->msgdef->itof.array,
-                                        d->msgdef->itof.array_size,
-                                        d->tmp);
+                                        d->msgdef->itof.array_size);
     CHECK_FLOW(ret.flow);
 #endif
 
-- 
cgit v1.2.3