Fix build with ASan 03/131803/1
authorGonzha Dmitriy Evgenevich <d.gonzha@samsung.com>
Tue, 30 May 2017 18:03:59 +0000 (21:03 +0300)
committerGonzha Dmitriy Evgenevich <d.gonzha@samsung.com>
Tue, 30 May 2017 18:03:59 +0000 (21:03 +0300)
Global variables moved to layout_network.c, header changed to
declaration with extern to fix build with --fno-common

Change-Id: I96316945e416465eb249f93226740879f0e5e5e8

include/layout.h
src/layout/layout_network.c

index b2c2ae1..6f2e78c 100644 (file)
@@ -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.
index 102e323..19bc077 100644 (file)
@@ -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,