summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Jensen <pauljensen@google.com>2016-02-15 01:32:39 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-02-15 01:32:39 +0000
commit8b1dd50bcf427b246ca83a1b022db32b9df28a3c (patch)
tree59e424bd9308178148400a1f1c7c8e68bf216ac8
parentcaac6464a3c83cebb64881c8a76b2707fed9526d (diff)
parentd0f1e60dcd609299fc4defb847e0729a5554d488 (diff)
downloadapf-8b1dd50bcf427b246ca83a1b022db32b9df28a3c.tar.gz
Make APF interpreter compile without C99 features.
am: d0f1e60dcd * commit 'd0f1e60dcd609299fc4defb847e0729a5554d488': Make APF interpreter compile without C99 features.
-rw-r--r--Android.mk1
-rw-r--r--apf_interpreter.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 71141e7..39576e6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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) {