Use the non-overlayed libbsd headers when we need our own definitions

diff --git a/include/bsd/err.h b/include/bsd/err.h
index b465c1bc154264f193b37c89cb2b2c61c7bacfbf..12fd051d2fd452a6baa5d3d51835f7622fedbaec 100644 (file)
--- a/include/bsd/err.h
+++ b/include/bsd/err.h
@@ -34,7 +34,11 @@
 #ifndef LIBBSD_ERR_H
 #define LIBBSD_ERR_H
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 
 #include <stdarg.h>
 

diff --git a/include/bsd/unistd.h b/include/bsd/unistd.h
index 78a45252e33b506a03f2098caa23a52391fbe01f..1f9c5f8ee13db5b72224a0a2a400705bcd3116bf 100644 (file)
--- a/include/bsd/unistd.h
+++ b/include/bsd/unistd.h
@@ -34,7 +34,11 @@
 #ifndef LIBBSD_UNISTD_H
 #define LIBBSD_UNISTD_H
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 #include <sys/stat.h>
 
 #ifndef S_ISTXT