[PATCH] make it build against musl

[PATCH] make it build against musl

[Sergey Alirzaev]

[-- Attachment #1: Type: text/plain, Size: 1744 bytes --]

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 813ed9b..914ca53 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 febc874..6331b0d 100644
--- a/src/log.c
+++ b/src/log.c
@@ -30,7 +30,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
+#ifdef __GLIBC__
 #include <execinfo.h>
+#endif
 #include <dlfcn.h>
 
 #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);
 }
-- 
2.4.1

Re: [PATCH] make it build against musl

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 306 bytes --]

Hi Sergey,

On 05/30/2015 04:13 AM, Sergey Alirzaev wrote:
> 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(-)
>

Applied, thanks.

Regards,
-Denis

Re: [PATCH] make it build against musl

[=?unknown-8bit?b?0J3QtdGC0L7Rh9C60LAg0J3QtdC30LLQsNC90L7QstCw?=]

[-- Attachment #1: Type: text/plain, Size: 195 bytes --]

On Sat, May 30, 2015 at 12:12 PM, Sergey Alirzaev <zl29ah@gmail.com> wrote:
> ifdef away GNU libc extensions and use a POSIXly correct pointer type

Is this going to be pushed to the master?