From cba37a13d2342e4c81b0be3c84010baf3d846162 Mon Sep 17 00:00:00 2001 From: Vincent Palatin Date: Mon, 27 Apr 2015 14:54:19 -0700 Subject: Fix type mismatch on extern declarations Update a few extern declarations to match the original variable type. Signed-off-by: Vincent Palatin BRANCH=none BUG=none TEST=make buildall Compile with LTO enabled and no longer see errors for those declarations. Change-Id: I5b0f0f7f498ec414a861cb1ce50a486036c853bd Reviewed-on: https://chromium-review.googlesource.com/271279 Trybot-Ready: Vincent Palatin Tested-by: Vincent Palatin Reviewed-by: Alec Berg Commit-Queue: Vincent Palatin --- chip/host/system.c | 2 +- test/adapter_externs.h | 2 +- test/thermal_falco_externs.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chip/host/system.c b/chip/host/system.c index e9de6b1214..b6a2fe6ab7 100644 --- a/chip/host/system.c +++ b/chip/host/system.c @@ -17,7 +17,7 @@ #include "util.h" #define SHARED_MEM_SIZE 512 /* bytes */ -char __shared_mem_buf[SHARED_MEM_SIZE]; +uint8_t __shared_mem_buf[SHARED_MEM_SIZE]; #define RAM_DATA_SIZE (sizeof(struct panic_data) + 512) /* bytes */ static char __ram_data[RAM_DATA_SIZE]; diff --git a/test/adapter_externs.h b/test/adapter_externs.h index c866b23c1b..c55cecea88 100644 --- a/test/adapter_externs.h +++ b/test/adapter_externs.h @@ -13,7 +13,7 @@ extern struct adapter_id_vals ad_id_vals[]; extern struct adapter_limits ad_limits[][NUM_AC_TURBO_STATES][NUM_AC_THRESHOLDS]; extern int ac_turbo; -extern int ap_is_throttled; +extern uint32_t ap_is_throttled; extern void check_threshold(int current, struct adapter_limits *lim); extern struct adapter_limits batt_limits[NUM_BATT_THRESHOLDS]; extern void watch_battery_closely(struct charge_state_context *ctx); diff --git a/test/thermal_falco_externs.h b/test/thermal_falco_externs.h index 6f202e0d5c..48c3c0ef18 100644 --- a/test/thermal_falco_externs.h +++ b/test/thermal_falco_externs.h @@ -9,7 +9,7 @@ /* Normally private symbols from the modules that we're testing. */ extern struct adapter_limits ad_limits[][NUM_AC_TURBO_STATES][NUM_AC_THRESHOLDS]; -extern int ap_is_throttled; +extern uint32_t ap_is_throttled; extern struct adapter_limits batt_limits[NUM_BATT_THRESHOLDS]; #endif /* __THERMAL_FALCO_EXTERNS_H */ -- cgit v1.2.1