summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2009-03-12 15:09:12 +0000
committerSteven Barth <steven@midlink.org>2009-03-12 15:09:12 +0000
commit6aa6fb88abd6ff1b39d58572b934ca5b17b8a89b (patch)
tree80afe9f773b3ab6f8a37b39084c3747f04f050b9
parent04eb9de74e06b8532fcb54986442ef8a5497c0ec (diff)
FreeBSD compatibility #3
-rw-r--r--libs/nixio/Makefile4
-rw-r--r--libs/nixio/src/splice.c1
2 files changed, 3 insertions, 2 deletions
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>