diff options
| author | Paul Jensen <pauljensen@google.com> | 2016-02-12 13:15:10 -0500 |
|---|---|---|
| committer | Paul Jensen <pauljensen@google.com> | 2016-02-12 13:15:10 -0500 |
| commit | d0f1e60dcd609299fc4defb847e0729a5554d488 (patch) | |
| tree | 59e424bd9308178148400a1f1c7c8e68bf216ac8 | |
| parent | 51d3c5fa9c0ad7dd551c05b06a62ecec09c029d8 (diff) | |
| download | apf-d0f1e60dcd609299fc4defb847e0729a5554d488.tar.gz | |
Make APF interpreter compile without C99 features.
This code is built by third-parties in build environments without
C99 features, so get it building cleanly in those environments.
Change-Id: Ic54807348282696d3dd588323fa06a7ead4aa74d
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | apf_interpreter.c | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -7,7 +7,6 @@ LOCAL_INCLUDES += $(LOCAL_PATH) LOCAL_CFLAGS += \ -DAPF_FRAME_HEADER_SIZE=14 \ - -std=c99 \ -Wall \ -Werror diff --git a/apf_interpreter.c b/apf_interpreter.c index 3960c93..abe4c5e 100644 --- a/apf_interpreter.c +++ b/apf_interpreter.c @@ -240,7 +240,8 @@ int accept_packet(const uint8_t* program, uint32_t program_len, if (len_field != 0) { const uint32_t imm_len = 1 << (len_field - 1); ASSERT_FORWARD_IN_PROGRAM(pc + imm_len - 1); - for (uint32_t i = 0; i < imm_len; i++) + uint32_t i; + for (i = 0; i < imm_len; i++) imm = (imm << 8) | program[pc++]; // Sign extend imm into signed_imm. signed_imm = imm << ((4 - imm_len) * 8); @@ -303,7 +304,8 @@ int accept_packet(const uint8_t* program, uint32_t program_len, } else if (len_field != 0) { uint32_t cmp_imm_len = 1 << (len_field - 1); ASSERT_FORWARD_IN_PROGRAM(pc + cmp_imm_len - 1); - for (uint32_t i = 0; i < cmp_imm_len; i++) + uint32_t i; + for (i = 0; i < cmp_imm_len; i++) cmp_imm = (cmp_imm << 8) | program[pc++]; } switch (opcode) { |