sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

main: Remove leftover HAVE_ELL conditions

This commit is contained in:
Marcel Holtmann 2018-11-01 20:54:37 +01:00
parent ad8a8a90a2
commit 6f431e2d70
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.c
View File

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