summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNishant Chaprana <n.chaprana@samsung.com>2021-09-06 16:40:36 +0530
committerNishant Chaprana <n.chaprana@samsung.com>2021-09-06 16:41:39 +0530
commitae2d4c4194018d5bd157a16a8678eaeb97e6a244 (patch)
tree82d9fc09f9bc275455f8ba976df62065c4f52ba5
parent2b9c3bf528efcb2a4a3380a7a1ae0f091a337115 (diff)
downloadconnman-ae2d4c4194018d5bd157a16a8678eaeb97e6a244.tar.gz
connman-ae2d4c4194018d5bd157a16a8678eaeb97e6a244.tar.bz2
connman-ae2d4c4194018d5bd157a16a8678eaeb97e6a244.zip
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>
-rwxr-xr-xsrc/service.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/src/service.c b/src/service.c
index a4091629..c61963ee 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)
{