From 317f4b144281181fcf2944785f02b452f7e569d5 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 1 May 2014 14:12:12 +0000 Subject: [PATCH] Fix building with musl libc POSIX says poll.h and signal.h should not be prefixed with sys/ (ie poll.h instead of sys/poll.h) limits.h also defines a TZNAME_MAX so we change name of the define for spandsp. --- libs/esl/src/include/esl.h | 2 +- libs/libscgi/src/include/scgi.h | 2 +- libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_os_nw.h | 2 +- libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_wait.h | 2 +- libs/spandsp/src/spandsp/private/timezone.h | 6 +++--- src/mod/applications/mod_spandsp/mod_spandsp_modem.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/esl/src/include/esl.h b/libs/esl/src/include/esl.h index 32ec2bdeb8..d48ae5f496 100644 --- a/libs/esl/src/include/esl.h +++ b/libs/esl/src/include/esl.h @@ -194,7 +194,7 @@ typedef enum { #include #include #include -#include +#include #include #include #endif diff --git a/libs/libscgi/src/include/scgi.h b/libs/libscgi/src/include/scgi.h index cc6b3c0cf6..332a0716db 100644 --- a/libs/libscgi/src/include/scgi.h +++ b/libs/libscgi/src/include/scgi.h @@ -116,7 +116,7 @@ typedef int scgi_filehandle_t; #include #include #include -#include +#include #include #include #endif diff --git a/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_os_nw.h b/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_os_nw.h index ed6cf386c0..75b73b0d1b 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_os_nw.h +++ b/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_os_nw.h @@ -58,7 +58,7 @@ #endif #if SU_HAVE_POLL -#include +#include #endif SOFIA_BEGIN_DECLS diff --git a/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_wait.h b/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_wait.h index ad67723bb4..7beaae61b9 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_wait.h +++ b/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_wait.h @@ -47,7 +47,7 @@ #endif #if SU_HAVE_POLL -#include +#include #endif SOFIA_BEGIN_DECLS diff --git a/libs/spandsp/src/spandsp/private/timezone.h b/libs/spandsp/src/spandsp/private/timezone.h index 87c67978a7..b2397cf2d2 100644 --- a/libs/spandsp/src/spandsp/private/timezone.h +++ b/libs/spandsp/src/spandsp/private/timezone.h @@ -30,7 +30,7 @@ #define TZ_MAX_LEAPS 50 /* Maximum number of leap second corrections */ -#define TZNAME_MAX 255 +#define SPANDSP_TZNAME_MAX 255 /* The TZ_MAX_TIMES value below is enough to handle a bit more than a * year's worth of solar time (corrected daily to the nearest second) or @@ -74,14 +74,14 @@ struct tz_state_s time_t ats[TZ_MAX_TIMES]; uint8_t types[TZ_MAX_TIMES]; struct tz_ttinfo_s ttis[TZ_MAX_TYPES]; - char chars[TZ_BIGGEST(TZ_MAX_CHARS + 1, (2*(TZNAME_MAX + 1)))]; + char chars[TZ_BIGGEST(TZ_MAX_CHARS + 1, (2*(SPANDSP_TZNAME_MAX + 1)))]; struct tz_lsinfo_s lsis[TZ_MAX_LEAPS]; }; struct tz_s { struct tz_state_s state; - char lcl_tzname[TZNAME_MAX + 1]; + char lcl_tzname[SPANDSP_TZNAME_MAX + 1]; int lcl_is_set; const char *tzname[2]; }; diff --git a/src/mod/applications/mod_spandsp/mod_spandsp_modem.h b/src/mod/applications/mod_spandsp/mod_spandsp_modem.h index 8d41cd2daa..02dc074325 100644 --- a/src/mod/applications/mod_spandsp/mod_spandsp_modem.h +++ b/src/mod/applications/mod_spandsp/mod_spandsp_modem.h @@ -89,7 +89,7 @@ (uint64_t)bswap_32((uint32_t)((value) >> 32))) #endif #include -#include +#include #endif #include #include