Fix ASAN build errors

[  288s] CMakeFiles/deviced.dir/src/battery/lowbat-handler.c.o:(.bss+0x140): multiple definition of `old_battery'
[  288s] CMakeFiles/deviced.dir/src/battery/battery-time.c.o:(.bss+0x200): first defined here
[  288s] CMakeFiles/deviced.dir/src/battery/lowbat-handler.c.o: In function `lowbat_initialized':
[  288s] /home/abuild/rpmbuild/BUILD/deviced-5.5.0/src/battery/lowbat-handler.c:102: multiple definition of `battery'
[  288s] CMakeFiles/deviced.dir/src/battery/battery-time.c.o:/home/abuild/rpmbuild/BUILD/deviced-5.5.0/src/battery/battery-time.c:363: first defined here

Change-Id: Ibf76f7265dfc1bf41c2b8e72de3dd6ed888ab7fc
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>

diff --git a/plugins/wearable/display/lbm.h b/plugins/wearable/display/lbm.h
index 5b1e319..9401ac6 100644 (file)
--- a/plugins/wearable/display/lbm.h
+++ b/plugins/wearable/display/lbm.h
@@ -38,7 +38,7 @@ struct lbm_config {
  * Global variables
  *   lbm_conf : configuration of lbm
  */
-struct lbm_config lbm_conf;
+extern struct lbm_config lbm_conf;
 
 int lbm_get_state(void);
 int lbm_set_state(int lbm);

diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c
index 33e170f..f375b0a 100644 (file)
--- a/src/battery/power-supply.c
+++ b/src/battery/power-supply.c
@@ -100,6 +100,8 @@ static const struct uevent_handler uh = {
        .uevent_func = uevent_power_handler,
 };
 
+struct battery_status battery;
+struct battery_status old_battery;
 static int noti_id;
 static int online_status;
 

diff --git a/src/battery/power-supply.h b/src/battery/power-supply.h
index 8c62417..cd4d929 100644 (file)
--- a/src/battery/power-supply.h
+++ b/src/battery/power-supply.h
@@ -106,8 +106,8 @@ struct battery_status {
        char power_source_s[32];
 };
 
-struct battery_status battery;
-struct battery_status old_battery;
+extern struct battery_status battery;
+extern struct battery_status old_battery;
 
 int power_supply_broadcast(char *sig, int status);