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.
This commit is contained in:
parent
13b411529f
commit
317f4b1442
|
@ -194,7 +194,7 @@ typedef enum {
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/select.h>
|
#include <sys/select.h>
|
||||||
#include <netinet/tcp.h>
|
#include <netinet/tcp.h>
|
||||||
#include <sys/signal.h>
|
#include <signal.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -116,7 +116,7 @@ typedef int scgi_filehandle_t;
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/select.h>
|
#include <sys/select.h>
|
||||||
#include <netinet/tcp.h>
|
#include <netinet/tcp.h>
|
||||||
#include <sys/signal.h>
|
#include <signal.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if SU_HAVE_POLL
|
#if SU_HAVE_POLL
|
||||||
#include <sys/poll.h>
|
#include <poll.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
SOFIA_BEGIN_DECLS
|
SOFIA_BEGIN_DECLS
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if SU_HAVE_POLL
|
#if SU_HAVE_POLL
|
||||||
#include <sys/poll.h>
|
#include <poll.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
SOFIA_BEGIN_DECLS
|
SOFIA_BEGIN_DECLS
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
#define TZ_MAX_LEAPS 50 /* Maximum number of leap second corrections */
|
#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
|
/* 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
|
* 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];
|
time_t ats[TZ_MAX_TIMES];
|
||||||
uint8_t types[TZ_MAX_TIMES];
|
uint8_t types[TZ_MAX_TIMES];
|
||||||
struct tz_ttinfo_s ttis[TZ_MAX_TYPES];
|
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_lsinfo_s lsis[TZ_MAX_LEAPS];
|
||||||
};
|
};
|
||||||
|
|
||||||
struct tz_s
|
struct tz_s
|
||||||
{
|
{
|
||||||
struct tz_state_s state;
|
struct tz_state_s state;
|
||||||
char lcl_tzname[TZNAME_MAX + 1];
|
char lcl_tzname[SPANDSP_TZNAME_MAX + 1];
|
||||||
int lcl_is_set;
|
int lcl_is_set;
|
||||||
const char *tzname[2];
|
const char *tzname[2];
|
||||||
};
|
};
|
||||||
|
|
|
@ -89,7 +89,7 @@
|
||||||
(uint64_t)bswap_32((uint32_t)((value) >> 32)))
|
(uint64_t)bswap_32((uint32_t)((value) >> 32)))
|
||||||
#endif
|
#endif
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <sys/signal.h>
|
#include <signal.h>
|
||||||
#endif
|
#endif
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
Loading…
Reference in New Issue