[Minios-devel] [UNIKRAFT PATCH 3/3] lib/posix-user: Adapt grp.h to Unikraft

[Costin Lupu <costin.lupu@xxxxxxxxx>]

Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx>
---
 lib/posix-user/Makefile.uk                 | 6 ++++--
 lib/posix-user/musl-imported/include/grp.h | 4 +---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/posix-user/Makefile.uk b/lib/posix-user/Makefile.uk
index 6234e5f8..e8b385d3 100644
--- a/lib/posix-user/Makefile.uk
+++ b/lib/posix-user/Makefile.uk
@@ -1,5 +1,7 @@
 $(eval $(call addlib_s,libposix_user,$(CONFIG_LIBPOSIX_USER)))
 
-CINCLUDES-y   += -I$(LIBPOSIX_USER_BASE)/include
-CXXINCLUDES-y += -I$(LIBPOSIX_USER_BASE)/include
+LIBPOSIX_USER_COMMON_INCLUDES-y += -I$(LIBPOSIX_USER_BASE)/include
+LIBPOSIX_USER_COMMON_INCLUDES-y += 
-I$(LIBPOSIX_USER_BASE)/musl-imported/include
+CINCLUDES-y   += $(LIBPOSIX_USER_COMMON_INCLUDES-y)
+CXXINCLUDES-y += $(LIBPOSIX_USER_COMMON_INCLUDES-y)
 LIBPOSIX_USER_SRCS-$(CONFIG_LIBPOSIX_USER) += $(LIBPOSIX_USER_BASE)/user.c
diff --git a/lib/posix-user/musl-imported/include/grp.h 
b/lib/posix-user/musl-imported/include/grp.h
index 27e8c5e6..a35e61a3 100644
--- a/lib/posix-user/musl-imported/include/grp.h
+++ b/lib/posix-user/musl-imported/include/grp.h
@@ -5,8 +5,6 @@
 extern "C" {
 #endif
 
-#include <features.h>
-
 #define __NEED_size_t
 #define __NEED_gid_t
 
@@ -14,7 +12,7 @@ extern "C" {
 #define __NEED_FILE
 #endif
 
-#include <bits/alltypes.h>
+#include <sys/types.h>
 
 struct group {
        char *gr_name;
-- 
2.20.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel