aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2017-01-23 19:49:07 +0100
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2017-01-23 19:49:07 +0100
commit254745880bb2ff7f17fe158fb7bfb5e1dc530906 (patch)
tree742f69e8473a216798c12e6a730d1afb6cfa7c48 /src
parent30ffa7ade5aa55e95cf888bbdd9028f2983d663c (diff)
misc: Fix build failure/warning when building on alpine linux
alpine linux is using the musl libc and this triggered some minor compilation issues. Remove unused mISDN include and defines from the general E1 input handling and address the other warnings and errors. /usr/include/sys/fcntl.h:1:2: warning: #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> [-Wcpp] #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> ^~~~~~~ In file included from input/misdn.c:48:0: ../include/mISDNif.h:286:2: error: unknown type name 'u_int' u_int id; ^~~~~ Change-Id: I997e45a456faedb5f370fd02ded300c1e36b791b
Diffstat (limited to 'src')
-rw-r--r--src/e1_input.c10
-rw-r--r--src/input/ipaccess.c2
-rw-r--r--src/input/misdn.c2
3 files changed, 3 insertions, 11 deletions
diff --git a/src/e1_input.c b/src/e1_input.c
index 2c8a541..09fea59 100644
--- a/src/e1_input.c
+++ b/src/e1_input.c
@@ -28,21 +28,13 @@
#include <errno.h>
#include <string.h>
#include <time.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <arpa/inet.h>
-#include <mISDNif.h>
#include <osmocom/abis/lapd.h>
-//#define AF_COMPATIBILITY_FUNC
-//#include <compat_af_isdn.h>
-#ifndef AF_ISDN
-#define AF_ISDN 34
-#define PF_ISDN AF_ISDN
-#endif
-
#include <osmocom/core/linuxlist.h>
#include <osmocom/core/talloc.h>
#include <osmocom/core/rate_ctr.h>
diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c
index 9e64471..ac84ffc 100644
--- a/src/input/ipaccess.c
+++ b/src/input/ipaccess.c
@@ -31,7 +31,7 @@
#include <netinet/tcp.h>
#include <string.h>
#include <time.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <arpa/inet.h>
diff --git a/src/input/misdn.c b/src/input/misdn.c
index 9315e23..98a836f 100644
--- a/src/input/misdn.c
+++ b/src/input/misdn.c
@@ -41,8 +41,8 @@
#include <errno.h>
#include <string.h>
#include <time.h>
-#include <sys/fcntl.h>
#include <sys/socket.h>
+#include <sys/types.h>
#include <sys/ioctl.h>
#include <arpa/inet.h>
#include <mISDNif.h>