summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoshua Haberman <joshua@reverberate.org>2011-02-27 13:55:47 -0800
committerJoshua Haberman <joshua@reverberate.org>2011-02-27 13:55:47 -0800
commit26264c25a5d22865ab459ef26f86f7d8dfe88f1e (patch)
tree3125eebd9ff1bc75f75f9940e9dfbbb2929c9247 /src
parent6f6a2937bfcb69a1ba74e8b5736c34ca915c4863 (diff)
Don't require NASM to build unless using the x64 decoder.
Diffstat (limited to 'src')
-rw-r--r--src/upb_decoder.c5
1 files changed, 2 insertions, 3 deletions
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
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback