From: Nishant Chaprana <n.chaprana@samsung.com>
Date: Mon, 6 Sep 2021 11:10:36 +0000 (+0530)
Subject: Fix build failure when tizen-maintain-online feature is enabled
X-Git-Tag: accepted/tizen/unified/20210915.025055~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F67%2F263567%2F1;p=platform%2Fupstream%2Fconnman.git

Fix build failure when tizen-maintain-online feature is enabled

Below are the build fail logs when tizen-maintain-online feature is enabled in spec file.
======================================================================================
[   37s] src/service.c: At top level:
[   37s] src/service.c:9432:17: error: redefinition of 'redo_wispr_ipv4'
[   37s]  9432 | static gboolean redo_wispr_ipv4(gpointer user_data)
[   37s]       |                 ^~~~~~~~~~~~~~~
[   37s] src/service.c:9413:17: note: previous definition of 'redo_wispr_ipv4' was here
[   37s]  9413 | static gboolean redo_wispr_ipv4(gpointer user_data)
[   37s]       |                 ^~~~~~~~~~~~~~~
[   37s] src/service.c: In function 'service_connect':
=====================================================================================

Change-Id: I1516358e55bba73af6383a8f7c8cc29c74f736fc
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
---

diff --git a/src/service.c b/src/service.c
index a409162..c61963e 100755
--- a/src/service.c
+++ b/src/service.c
@@ -9414,7 +9414,13 @@ static gboolean redo_wispr_ipv4(gpointer user_data)
 {
 	struct connman_service *service = user_data;
 
+#if defined TIZEN_MAINTAIN_ONLINE
+	DBG("");
+
+	__connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+#else
 	redo_wispr(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+#endif
 
 	return FALSE;
 }
@@ -9428,19 +9434,6 @@ static gboolean redo_wispr_ipv6(gpointer user_data)
 	return FALSE;
 }
 
-#if defined TIZEN_MAINTAIN_ONLINE
-static gboolean redo_wispr_ipv4(gpointer user_data)
-{
-	struct connman_service *service = user_data;
-
-	DBG("");
-
-	__connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4);
-
-	return FALSE;
-}
-#endif
-
 int __connman_service_online_check_failed(struct connman_service *service,
 					enum connman_ipconfig_type type)
 {