Rename LIBBSD_CLEAN_INCLUDES to LIBBSD_DISABLE_DEPRECATED

diff --git a/Makefile b/Makefile
index 60d94a59cb1f0448f6607a229800519a101464a7..bd805ed91656d725e3ed11162aea7452e28ff19c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -129,7 +129,7 @@ LDFLAGS ?=
 
 # Internal makefile variables
 MK_CPPFLAGS := -Iinclude/bsd/ -Iinclude/ \
-       -DLIBBSD_OVERLAY -DLIBBSD_CLEAN_INCLUDES \
+       -DLIBBSD_OVERLAY -DLIBBSD_DISABLE_DEPRECATED \
        -D_GNU_SOURCE -D__REENTRANT
 MK_CFLAGS :=
 MK_LDFLAGS :=

diff --git a/include/bsd/bsd.h b/include/bsd/bsd.h
index bba4ac8196d3d365bf05321260f1d60f527387e1..c0838057a40fe9e94db88e037eb95374381be9c8 100644 (file)
--- a/include/bsd/bsd.h
+++ b/include/bsd/bsd.h
@@ -42,7 +42,7 @@
 #include <bsd/md5.h>
 
 /* FIXME: Will be removed in the future. */
-#ifndef LIBBSD_CLEAN_INCLUDES
+#ifndef LIBBSD_DISABLE_DEPRECATED
 #include <time.h>
 #endif
 

diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
index a22cbe5909c890c2a2f4c382cf8f6483f8115cb9..8e885f6efe21b49e4d89aed53113d0c94a7194ab 100644 (file)
--- a/include/bsd/stdlib.h
+++ b/include/bsd/stdlib.h
@@ -47,7 +47,7 @@
 #endif
 
 /* FIXME: Temporary inclusions to avoid API breakage, will be removed soon. */
-#ifndef LIBBSD_CLEAN_INCLUDES
+#ifndef LIBBSD_DISABLE_DEPRECATED
 #include <bsd/stdio.h>
 #include <bsd/unistd.h>
 #endif

diff --git a/include/bsd/string.h b/include/bsd/string.h
index 7d23f7d1a9997f68d3eccc80b17cb470a375944f..b0199d75fa2ef7b6a418d674f8199a43fb135707 100644 (file)
--- a/include/bsd/string.h
+++ b/include/bsd/string.h
@@ -36,7 +36,7 @@
 #include <string.h>
 #endif
 
-#ifndef LIBBSD_CLEAN_INCLUDES
+#ifndef LIBBSD_DISABLE_DEPRECATED
 /* FIXME: Temporary inclusion to avoid API breakage, will be removed soon. */
 #include <bsd/stdio.h>
 #endif