From 6f431e2d70c5cfdb0d8334c5dd93c0fbf188ea3f Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Thu, 1 Nov 2018 20:54:37 +0100
Subject: [PATCH] main: Remove leftover HAVE_ELL conditions

---
 src/main.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/main.c b/src/main.c
index 2c1b23a0..8623a060 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,9 +32,7 @@
 
 #include <gdbus.h>
 
-#ifdef HAVE_ELL
 #include <ell/ell.h>
-#endif
 
 #include "ofono.h"
 
@@ -174,7 +172,6 @@ static GOptionEntry options[] = {
 	{ NULL },
 };
 
-#ifdef HAVE_ELL
 struct ell_event_source {
 	GSource source;
 	GPollFD pollfd;
@@ -198,7 +195,6 @@ static GSourceFuncs event_funcs = {
 	.prepare = event_prepare,
 	.check = event_check,
 };
-#endif
 
 int main(int argc, char **argv)
 {
@@ -207,9 +203,7 @@ int main(int argc, char **argv)
 	DBusConnection *conn;
 	DBusError error;
 	guint signal;
-#ifdef HAVE_ELL
 	struct ell_event_source *source;
-#endif
 
 	context = g_option_context_new(NULL);
 	g_option_context_add_main_entries(context, options, NULL);
@@ -241,7 +235,6 @@ int main(int argc, char **argv)
 
 	event_loop = g_main_loop_new(NULL, FALSE);
 
-#ifdef HAVE_ELL
 	l_log_set_stderr();
 	l_debug_enable("*");
 	l_main_init();
@@ -255,8 +248,6 @@ int main(int argc, char **argv)
 	g_source_add_poll((GSource *)source, &source->pollfd);
 	g_source_attach((GSource *) source,
 					g_main_loop_get_context(event_loop));
-#endif
-
 
 	signal = setup_signalfd();
 
@@ -305,10 +296,9 @@ int main(int argc, char **argv)
 cleanup:
 	g_source_remove(signal);
 
-#ifdef HAVE_ELL
 	g_source_destroy((GSource *) source);
 	l_main_exit();
-#endif
+
 	g_main_loop_unref(event_loop);
 
 	__ofono_log_cleanup();