From 4a937b96aa883034adb6f216c2e212a4611c503b Mon Sep 17 00:00:00 2001 From: Sergey Alirzaev Date: Sat, 30 May 2015 12:13:56 +0300 Subject: [PATCH] build: make ofono build against musl ifdef away GNU libc extensions and use a POSIXly correct pointer type --- gatchat/ppp_net.c | 2 +- src/log.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gatchat/ppp_net.c b/gatchat/ppp_net.c index 813ed9b5..914ca537 100644 --- a/gatchat/ppp_net.c +++ b/gatchat/ppp_net.c @@ -67,7 +67,7 @@ gboolean ppp_net_set_mtu(struct ppp_net *net, guint16 mtu) strncpy(ifr.ifr_name, net->if_name, sizeof(ifr.ifr_name)); ifr.ifr_mtu = mtu; - err = ioctl(sk, SIOCSIFMTU, (caddr_t) &ifr); + err = ioctl(sk, SIOCSIFMTU, (void *) &ifr); close(sk); diff --git a/src/log.c b/src/log.c index febc874f..6331b0df 100644 --- a/src/log.c +++ b/src/log.c @@ -30,7 +30,9 @@ #include #include #include +#ifdef __GLIBC__ #include +#endif #include #include "ofono.h" @@ -113,6 +115,7 @@ void ofono_debug(const char *format, ...) va_end(ap); } +#ifdef __GLIBC__ static void print_backtrace(unsigned int offset) { void *frames[99]; @@ -240,6 +243,7 @@ static void signal_setup(sighandler_t handler) sigaction(SIGABRT, &sa, NULL); sigaction(SIGPIPE, &sa, NULL); } +#endif extern struct ofono_debug_desc __start___debug[]; extern struct ofono_debug_desc __stop___debug[]; @@ -305,7 +309,9 @@ int __ofono_log_init(const char *program, const char *debug, if (detach == FALSE) option |= LOG_PERROR; +#ifdef __GLIBC__ signal_setup(signal_handler); +#endif openlog(basename(program), option, LOG_DAEMON); @@ -320,7 +326,9 @@ void __ofono_log_cleanup(void) closelog(); +#ifdef __GLIBC__ signal_setup(SIG_DFL); +#endif g_strfreev(enabled); }