From: Steven Barth <steven@midlink.org>
Date: Thu, 12 Mar 2009 15:09:12 +0000 (+0000)
Subject: FreeBSD compatibility #3
X-Git-Tag: 0.9.0~604
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6aa6fb88abd6ff1b39d58572b934ca5b17b8a89b;p=oweals%2Fluci.git

FreeBSD compatibility #3
---

diff --git a/libs/nixio/Makefile b/libs/nixio/Makefile
index aca275170..228f6e5b6 100644
--- 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 c7aa817af..f64144627 100644
--- 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>