Include the correct deprecated headeres when using the overlay

diff --git a/include/bsd/cdefs.h b/include/bsd/cdefs.h
index 30399306ba7d9696692053d70012d1566ed052f1..bbb69071ddf36556ceb9556ea08975dbc3ceb9c6 100644 (file)
--- a/include/bsd/cdefs.h
+++ b/include/bsd/cdefs.h
@@ -33,7 +33,11 @@
 #warning "Deprecated header, use <bsd/sys/cdefs.h> or libbsd-overlay.pc instead."
 #endif
 
+#ifdef LIBBSD_OVERLAY
+#include <sys/cdefs.h>
+#else
 #include <bsd/sys/cdefs.h>
+#endif
 
 #endif
 

diff --git a/include/bsd/ip_icmp.h b/include/bsd/ip_icmp.h
index 65f3ff7a2cd48ee4cef06eec5af017404d2fd1b5..0f34a5a4abfeb9d2aa3f1c1ec5dcc603de55fed8 100644 (file)
--- a/include/bsd/ip_icmp.h
+++ b/include/bsd/ip_icmp.h
@@ -33,7 +33,11 @@
 #warning "Deprecated header, use <bsd/netinet/ip_icmp.h> or libbsd-overlay.pc instead."
 #endif
 
+#ifdef LIBBSD_OVERLAY
+#include <netinet/ip_icmp.h>
+#else
 #include <bsd/netinet/ip_icmp.h>
+#endif
 
 #endif
 

diff --git a/include/bsd/queue.h b/include/bsd/queue.h
index 30775ecc55f4a0565e71f2de1887929590179d3f..c4792304d0e8f15eef8d7aac6d717cb98f365e42 100644 (file)
--- a/include/bsd/queue.h
+++ b/include/bsd/queue.h
@@ -33,7 +33,11 @@
 #warning "Deprecated header, use <bsd/sys/queue.h> or libbsd-overlay.pc instead."
 #endif
 
+#ifdef LIBBSD_OVERLAY
+#include <sys/queue.h>
+#else
 #include <bsd/sys/queue.h>
+#endif
 
 #endif
 

diff --git a/include/bsd/random.h b/include/bsd/random.h
index 7b35f8bf4d4b5166ab28b475bc452ee0c56dd0dc..3b90a6633450317e163219bb8ed38a02ecf24c96 100644 (file)
--- a/include/bsd/random.h
+++ b/include/bsd/random.h
@@ -33,7 +33,11 @@
 #warning "Deprecated header, use <bsd/stdlib.h> instead."
 #endif
 
+#ifdef LIBBSD_OVERLAY
+#include <stdlib.h>
+#else
 #include <bsd/stdlib.h>
+#endif
 
 #endif
 

diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
index 8e885f6efe21b49e4d89aed53113d0c94a7194ab..217a4162f3cf91e514f9930f867175c1f5a83ac3 100644 (file)
--- a/include/bsd/stdlib.h
+++ b/include/bsd/stdlib.h
@@ -48,9 +48,14 @@
 
 /* FIXME: Temporary inclusions to avoid API breakage, will be removed soon. */
 #ifndef LIBBSD_DISABLE_DEPRECATED
+#ifdef LIBBSD_OVERLAY
+#include <stdio.h>
+#include <unistd.h>
+#else
 #include <bsd/stdio.h>
 #include <bsd/unistd.h>
 #endif
+#endif
 
 __BEGIN_DECLS
 u_int32_t arc4random();

diff --git a/include/bsd/string.h b/include/bsd/string.h
index b0199d75fa2ef7b6a418d674f8199a43fb135707..fb7d4a7396f1cdbc6766782b9ee86e76a79c14fb 100644 (file)
--- a/include/bsd/string.h
+++ b/include/bsd/string.h
@@ -38,8 +38,12 @@
 
 #ifndef LIBBSD_DISABLE_DEPRECATED
 /* FIXME: Temporary inclusion to avoid API breakage, will be removed soon. */
+#ifdef LIBBSD_OVERLAY
+#include <stdio.h>
+#else
 #include <bsd/stdio.h>
 #endif
+#endif
 
 __BEGIN_DECLS
 size_t strlcpy(char *dst, const char *src, size_t siz);