From: Mihai Pogonaru <pogonarumihai@gmail.com>
Date: Mon, 28 Oct 2019 23:40:02 +0000 (+0200)
Subject: Adapt sendfile.h to Unikraft
X-Git-Tag: RELEASE-0.4~22
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d1ffaa42d315c4471414d516be85896a679e658c;p=unikraft%2Flibs%2Flwip.git

Adapt sendfile.h to Unikraft

Signed-off-by: Mihai Pogonaru <pogonarumihai@gmail.com>
Reviewed-by: Costin Lupu <costin.lupu@cs.pub.ro>
---

diff --git a/Makefile.uk b/Makefile.uk
index 79a6dc6..ed1ff75 100644
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -57,8 +57,11 @@ LIBLWIP_EXTRACTED=$(LIBLWIP_ORIGIN)/$(LIBLWIP_ZIPNAME)/src
 ################################################################################
 # Library includes
 ################################################################################
-CINCLUDES-$(CONFIG_LIBLWIP)   += -I$(LIBLWIP_BASE)/include -I$(LIBLWIP_EXTRACTED)/include
-CXXINCLUDES-$(CONFIG_LIBLWIP) += -I$(LIBLWIP_BASE)/include -I$(LIBLWIP_EXTRACTED)/include
+LIBLWIP_COMMON_INCLUDES-y += -I$(LIBLWIP_BASE)/include
+LIBLWIP_COMMON_INCLUDES-y += -I$(LIBLWIP_BASE)/musl-imported/include
+LIBLWIP_COMMON_INCLUDES-y += -I$(LIBLWIP_EXTRACTED)/include
+CINCLUDES-$(CONFIG_LIBLWIP)   += $(LIBLWIP_COMMON_INCLUDES-y)
+CXXINCLUDES-$(CONFIG_LIBLWIP) += $(LIBLWIP_COMMON_INCLUDES-y)
 
 ################################################################################
 # Library flags
diff --git a/musl-imported/include/sys/sendfile.h b/musl-imported/include/sys/sendfile.h
index e7570d8..c66eae0 100644
--- a/musl-imported/include/sys/sendfile.h
+++ b/musl-imported/include/sys/sendfile.h
@@ -5,8 +5,7 @@
 extern "C" {
 #endif
 
-#include <features.h>
-#include <unistd.h>
+#include <sys/types.h>
 
 ssize_t sendfile(int, int, off_t *, size_t);