From 55645a6fb7c81a6c989d1b8133264aed98ec8ee1 Mon Sep 17 00:00:00 2001 From: gameblabla Date: Mon, 20 Aug 2018 01:59:17 +0200 Subject: [PATCH] Fixes for Musl --- core/deps/ifaddrs/ifaddrs.h | 10 ++++++---- core/deps/libwebsocket/private-libwebsockets.h | 1 - core/deps/libwebsocket/sha-1.c | 2 -- core/oslib/audiobackend_oss.cpp | 4 ---- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/core/deps/ifaddrs/ifaddrs.h b/core/deps/ifaddrs/ifaddrs.h index 9cd19fec1..7c044c0bc 100644 --- a/core/deps/ifaddrs/ifaddrs.h +++ b/core/deps/ifaddrs/ifaddrs.h @@ -44,11 +44,13 @@ struct ifaddrs { #define ifa_broadaddr ifa_dstaddr /* broadcast address interface */ #endif -#include - -__BEGIN_DECLS +#ifdef _cplusplus +extern "C" { +#endif extern int getifaddrs(struct ifaddrs **ifap); extern void freeifaddrs(struct ifaddrs *ifa); -__END_DECLS +#ifdef _cplusplus +} +#endif #endif diff --git a/core/deps/libwebsocket/private-libwebsockets.h b/core/deps/libwebsocket/private-libwebsockets.h index b0d9afba5..483d1e78f 100644 --- a/core/deps/libwebsocket/private-libwebsockets.h +++ b/core/deps/libwebsocket/private-libwebsockets.h @@ -203,7 +203,6 @@ typedef unsigned __int64 u_int64_t; #else #include -#include #include #if defined(__APPLE__) diff --git a/core/deps/libwebsocket/sha-1.c b/core/deps/libwebsocket/sha-1.c index 98b208b22..f29b2c3a6 100644 --- a/core/deps/libwebsocket/sha-1.c +++ b/core/deps/libwebsocket/sha-1.c @@ -99,8 +99,6 @@ static const unsigned int _K[] = sha1_step(ctxt); \ } -static void sha1_step __P((struct sha1_ctxt *)); - static void sha1_step(struct sha1_ctxt *ctxt) { diff --git a/core/oslib/audiobackend_oss.cpp b/core/oslib/audiobackend_oss.cpp index 675a3a90f..67015db6c 100644 --- a/core/oslib/audiobackend_oss.cpp +++ b/core/oslib/audiobackend_oss.cpp @@ -2,11 +2,7 @@ #ifdef USE_OSS #include #include -#ifdef TARGET_BSD #include -#else -#include -#endif #include static int oss_audio_fd = -1;