wap supplicant: Fix problem of multiple declaration of fn_destroy

This patch fixes multiple declaration of fn_destroy. This can cause linking
error when kasan is enabled.

Change-Id: I07221ca05b3952b42ddae247b307cd2909a909d2
Signed-off-by: EunBong Song <eunb.song@samsung.com>

diff --git a/apps/wpa_supplicant/src/utils/eloop.h b/apps/wpa_supplicant/src/utils/eloop.h
index 5fb7e45..8462608 100644 (file)
--- a/apps/wpa_supplicant/src/utils/eloop.h
+++ b/apps/wpa_supplicant/src/utils/eloop.h
@@ -344,5 +344,5 @@ int eloop_terminated(void);
  */
 void eloop_wait_for_read_sock(int sock);
 
-eloop_timeout_handler fn_destroy;
+extern eloop_timeout_handler fn_destroy;
 #endif                                                 /* ELOOP_H */

diff --git a/apps/wpa_supplicant/wpa_supplicant/events.c b/apps/wpa_supplicant/wpa_supplicant/events.c
index 57007a9..a98d731 100644 (file)
--- a/apps/wpa_supplicant/wpa_supplicant/events.c
+++ b/apps/wpa_supplicant/wpa_supplicant/events.c
@@ -46,6 +46,8 @@
 #include "mesh_mpm.h"
 #include "wmm_ac.h"
 
+eloop_timeout_handler fn_destroy;
+
 #ifndef CONFIG_NO_SCAN_PROCESSING
 static int wpas_select_network_from_last_scan(struct wpa_supplicant *wpa_s, int new_scan, int own_request);
 #endif                                                 /* CONFIG_NO_SCAN_PROCESSING */