FreeBSD compatibility #3

diff --git a/libs/nixio/Makefile b/libs/nixio/Makefile
index aca275170025bbdd5ddee88cd8cc3f4d99552c3b..228f6e5b6b3aa01aa373907afc699b9ac23e604b 100644 (file)
--- a/libs/nixio/Makefile
+++ b/libs/nixio/Makefile
@@ -13,7 +13,7 @@ NIXIO_OBJ = src/nixio.o src/socket.o src/sockopt.o src/bind.o src/address.o \
            src/tls-context.o src/tls-socket.o
 
 ifeq ($(NIXIO_TLS),axtls)
-       TLS_CFLAGS = -IaxTLS/{ssl,crypto,config} -include src/openssl-compat.h
+       TLS_CFLAGS = -IaxTLS/ssl -IaxTLS/crypto -IaxTLS/config -include src/openssl-compat.h
        TLS_DEPENDS = src/openssl-compat.o
        NIXIO_OBJ += src/openssl-compat.o src/libaxtls.a
 endif
@@ -51,7 +51,7 @@ compile: $(NIXIO_OBJ)
 $(AXTLS_DIR)/.prepared:
        #rm -rf $(AXTLS_DIR)
        #tar xvfz $(AXTLS_FILE)
-       cp axtls-config/{.config,config.h} $(AXTLS_DIR)/config
+       cp axtls-config/.config axtls-config/config.h $(AXTLS_DIR)/config
        touch $@
 
 src/libaxtls.a: $(AXTLS_DIR)/.prepared

diff --git a/libs/nixio/src/splice.c b/libs/nixio/src/splice.c
index c7aa817af7c7abaed92713c9084b742e513a4147..f64144627cc5405dfbaca14688ade83c80b3c557 100644 (file)
--- a/libs/nixio/src/splice.c
+++ b/libs/nixio/src/splice.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
+#include <sys/param.h>
 
 #ifndef BSD
 #include <sys/sendfile.h>