From: Gonzha Dmitriy Evgenevich Date: Tue, 30 May 2017 18:03:59 +0000 (+0300) Subject: Fix build with ASan X-Git-Tag: submit/tizen/20170614.011152~4^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F03%2F131803%2F1;p=profile%2Ftv%2Fapps%2Fnative%2Fair_settings.git Fix build with ASan Global variables moved to layout_network.c, header changed to declaration with extern to fix build with --fno-common Change-Id: I96316945e416465eb249f93226740879f0e5e5e8 --- diff --git a/include/layout.h b/include/layout.h index b2c2ae1..6f2e78c 100644 --- a/include/layout.h +++ b/include/layout.h @@ -37,12 +37,12 @@ enum layout_type { }; -Evas_Object *connecting_wired_popup; -Evas_Object *connected_wired_popup; -Evas_Object *failed_wired_popup; -Evas_Object *connecting_wireless_popup; -Evas_Object *connected_wireless_popup; -Evas_Object *failed_wireless_popup; +extern Evas_Object *connecting_wired_popup; +extern Evas_Object *connected_wired_popup; +extern Evas_Object *failed_wired_popup; +extern Evas_Object *connecting_wireless_popup; +extern Evas_Object *connected_wireless_popup; +extern Evas_Object *failed_wireless_popup; /** * @brief Get the pointer to the layout_class object of picture layout. diff --git a/src/layout/layout_network.c b/src/layout/layout_network.c index 102e323..19bc077 100644 --- a/src/layout/layout_network.c +++ b/src/layout/layout_network.c @@ -66,6 +66,13 @@ const char *str_network_type_opt[] = { STR_NEW_NETWORK, }; +Evas_Object *connecting_wired_popup; +Evas_Object *connected_wired_popup; +Evas_Object *failed_wired_popup; +Evas_Object *connecting_wireless_popup; +Evas_Object *connected_wireless_popup; +Evas_Object *failed_wireless_popup; + static void _remove_wifi_passcode_popup(struct _priv *priv); static void _retry_wired_network(struct _priv *priv); static bool _draw_wifi_passcode_popup(struct _priv *priv, char *wifi_name,