Add LIBBSD_DISABLE_DEPRECATED to deprecated headers

When enabled this will make the inclusion of deprecated headers a
fatal error so that it's easier to spot.

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

diff --git a/include/bsd/inet.h b/include/bsd/inet.h
index 5f4862d34f452e2222f349dd5d3f247e97979064..223baf50ba68f172c55d0827f49211bca7accd00 100644 (file)
--- a/include/bsd/inet.h
+++ b/include/bsd/inet.h
@@ -27,7 +27,11 @@
 #ifndef LIBBSD_INET_H
 #define LIBBSD_INET_H
 
+#ifdef LIBBSD_DISABLE_DEPRECATED
+#error "Deprecated header, use <arpa/inet.h> instead."
+#else
 #warning "Deprecated header, use <arpa/inet.h> instead."
+#endif
 
 #include <arpa/inet.h>
 

diff --git a/include/bsd/ip_icmp.h b/include/bsd/ip_icmp.h
index 53e976a44b7bd90cb46b7b3fd6a630ab63391eb7..65f3ff7a2cd48ee4cef06eec5af017404d2fd1b5 100644 (file)
--- a/include/bsd/ip_icmp.h
+++ b/include/bsd/ip_icmp.h
@@ -27,7 +27,11 @@
 #ifndef LIBBSD_BSD_IP_ICMP_H
 #define LIBBSD_BSD_IP_ICMP_H
 
+#ifdef LIBBSD_DISABLE_DEPRECATED
+#error "Deprecated header, use <bsd/netinet/ip_icmp.h> or libbsd-overlay.pc instead."
+#else
 #warning "Deprecated header, use <bsd/netinet/ip_icmp.h> or libbsd-overlay.pc instead."
+#endif
 
 #include <bsd/netinet/ip_icmp.h>
 

diff --git a/include/bsd/queue.h b/include/bsd/queue.h
index 56f5515aeadb42b8f0c074cd1cfff16ba40935a7..30775ecc55f4a0565e71f2de1887929590179d3f 100644 (file)
--- a/include/bsd/queue.h
+++ b/include/bsd/queue.h
@@ -27,7 +27,11 @@
 #ifndef LIBBSD_BSD_QUEUE_H
 #define LIBBSD_BSD_QUEUE_H
 
+#ifdef LIBBSD_DISABLE_DEPRECATED
+#error "Deprecated header, use <bsd/sys/queue.h> or libbsd-overlay.pc instead."
+#else
 #warning "Deprecated header, use <bsd/sys/queue.h> or libbsd-overlay.pc instead."
+#endif
 
 #include <bsd/sys/queue.h>
 

diff --git a/include/bsd/random.h b/include/bsd/random.h
index bfbd0abd24ecbbcf08065c8c2c83e2928bb9ca66..7b35f8bf4d4b5166ab28b475bc452ee0c56dd0dc 100644 (file)
--- a/include/bsd/random.h
+++ b/include/bsd/random.h
@@ -27,7 +27,11 @@
 #ifndef LIBBSD_RANDOM_H
 #define LIBBSD_RANDOM_H
 
+#ifdef LIBBSD_DISABLE_DEPRECATED
+#error "Deprecated header, use <bsd/stdlib.h> instead."
+#else
 #warning "Deprecated header, use <bsd/stdlib.h> instead."
+#endif
 
 #include <bsd/stdlib.h>
 

diff --git a/include/libutil.h b/include/libutil.h
index f2196f7d50cd8dbd8f2d07d3912d03dbd8b83e99..a995c4a0b4a2a738713200e313407dd2ee75c1a0 100644 (file)
--- a/include/libutil.h
+++ b/include/libutil.h
@@ -27,7 +27,11 @@
 #ifndef LIBBSD_LIBUTIL_H
 #define LIBBSD_LIBUTIL_H
 
+#ifdef LIBBSD_DISABLE_DEPRECATED
+#error "Deprecated header, use <bsd/libutil.h> or libbsd-overlay.pc instead."
+#else
 #warning "Deprecated header, use <bsd/libutil.h> or libbsd-overlay.pc instead."
+#endif
 
 #include <bsd/libutil.h>
 

diff --git a/include/nlist.h b/include/nlist.h
index 9c5c5eb1cebb8bdb0549078e591177d82e8a4ffd..ee576ae15034c4e8d7f59a01aa25ee25407b1ebc 100644 (file)
--- a/include/nlist.h
+++ b/include/nlist.h
@@ -27,7 +27,11 @@
 #ifndef LIBBSD_NLIST_H
 #define LIBBSD_NLIST_H
 
+#ifdef LIBBSD_DISABLE_DEPRECATED
+#error "Deprecated header, use <bsd/nlist.h> or libbsd-overlay.pc instead."
+#else
 #warning "Deprecated header, use <bsd/nlist.h> or libbsd-overlay.pc instead."
+#endif
 
 #include <bsd/nlist.h>
 

diff --git a/include/vis.h b/include/vis.h
index 564c10d3706afd6bd8281672a9734bdb09869a46..16f7976986b4f16852fb82abd8013ff56232a8b1 100644 (file)
--- a/include/vis.h
+++ b/include/vis.h
@@ -27,7 +27,11 @@
 #ifndef LIBBSD_VIS_H
 #define LIBBSD_VIS_H
 
+#ifdef LIBBSD_DISABLE_DEPRECATED
+#error "Deprecated header, use <bsd/vis.h> or libbsd-overlay.pc instead."
+#else
 #warning "Deprecated header, use <bsd/vis.h> or libbsd-overlay.pc instead."
+#endif
 
 #include <bsd/vis.h>