From 48ac79b1883981f5135b5b9c76ca268e6cbe65b2 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@hadrons.org>
Date: Sat, 12 Dec 2015 14:27:12 +0100
Subject: [PATCH] Use the non-overlayed libbsd headers when we need our own
 definitions

---
 include/bsd/err.h    | 4 ++++
 include/bsd/unistd.h | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/include/bsd/err.h b/include/bsd/err.h
index b465c1b..12fd051 100644
--- 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 78a4525..1f9c5f8 100644
--- 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
-- 
2.47.2