From 64c972454faea1eb2c928d25f2feedc5896f5d1d Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 15 Jun 2009 19:21:36 +0000
Subject: [PATCH] luci-0.9: merge r4843, r4844

---
 contrib/package/cyassl-luci/Makefile | 4 ++--
 libs/nixio/src/splice.c              | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/contrib/package/cyassl-luci/Makefile b/contrib/package/cyassl-luci/Makefile
index 53b319b24..6d1b6a655 100644
--- a/contrib/package/cyassl-luci/Makefile
+++ b/contrib/package/cyassl-luci/Makefile
@@ -37,9 +37,9 @@ define Package/libcyassl-luci/description
 	CyaSSL is an SSL library optimized for small footprint, both on disk and for memory use.
 endef
 
-TARGET_CFLAGS += $(FPIC) -DTFM_NO_ASM
+TARGET_CFLAGS += $(FPIC)
 
-CONFIGURE_ARGS += --without-zlib --enable-fastmath
+CONFIGURE_ARGS += --without-zlib
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/ctaocrypt
diff --git a/libs/nixio/src/splice.c b/libs/nixio/src/splice.c
index db215efb1..0704dfd24 100644
--- a/libs/nixio/src/splice.c
+++ b/libs/nixio/src/splice.c
@@ -59,6 +59,15 @@ ssize_t splice(int __fdin, __off64_t *__offin, int __fdout,
 	return -1;
 #endif
 }
+
+#undef SPLICE_F_MOVE
+#undef SPLICE_F_NONBLOCK
+#undef SPLICE_F_MORE
+
+#define SPLICE_F_MOVE 1
+#define SPLICE_F_NONBLOCK 2
+#define SPLICE_F_MORE 4
+
 #endif /* __UCLIBC__ */
 
 /**
-- 
2.25.1