Move <bsd/cdefs.h> to <bsd/sys/cdefs.h>

This maps more closely the location of the real header. For
transitional purposes keep a <bsd/cdefs.h> that warns and includes
<bsd/sys/cdefs.h>.

Makefile

@@ -44,6 +44,8 @@ LIB_GEN_SRCS := \
 	src/hash/md5hl.c
 
 LIB_INCLUDES := \
+	bsd/cdefs.h \
+	bsd/sys/cdefs.h \
 	bsd/err.h \
 	bsd/getopt.h \
 	bsd/inet.h \
@@ -53,7 +55,6 @@ LIB_INCLUDES := \
 	bsd/md5.h \
 	bsd/string.h \
 	bsd/bsd.h \
-	bsd/cdefs.h \
 	bsd/stdlib.h \
 	nlist.h \
 	vis.h \
@@ -150,6 +151,7 @@ install: libs man
 	mkdir -p $(DESTDIR)$(libdir)
 	mkdir -p $(DESTDIR)$(usrlibdir)
 	mkdir -p $(DESTDIR)$(includedir)/bsd/
+	mkdir -p $(DESTDIR)$(includedir)/bsd/sys/
 	mkdir -p $(DESTDIR)$(mandir)/man3
 	mkdir -p $(DESTDIR)$(pkgconfigdir)
 	install -m644 $(LIB_STATIC) $(DESTDIR)$(usrlibdir)

include/bsd/bsd.h

@@ -31,7 +31,7 @@
  * Include all bsd compat headers.
  */
 
-#include <bsd/cdefs.h>
+#include <bsd/sys/cdefs.h>
 #include <bsd/stdlib.h>
 #include <bsd/string.h>
 #include <bsd/err.h>

include/bsd/cdefs.h

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004, 2005, 2006, 2009 Guillem Jover
+ * Copyright © 2009 Guillem Jover
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -24,69 +24,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef LIBBSD_CDEFS_H
+#ifndef LIBBSD_BSD_CDEFS_H
-#define LIBBSD_CDEFS_H
+#define LIBBSD_BSD_CDEFS_H
 
-#include <sys/cdefs.h>
+#warning "This header is deprecated, use the one in bsd/sys/cdefs.h instead."
 
-#ifndef setproctitle
+#include <bsd/sys/cdefs.h>
-# define setproctitle(fmt, args...)
-#endif
-
-#ifndef __dead2
-# define __dead2
-#endif
-
-#ifndef __pure2
-# define __pure2
-#endif
-
-/* Linux headers define a struct with a member names __unused.
- * Disable for now. */
-#if 0
-#ifndef __unused
-# ifdef __GNUC__
-#  define __unused __attribute__((unused))
-# else
-#  define __unused
-# endif
-#endif
-#endif
-
-#ifndef __printflike
-# ifdef __GNUC__
-#  define __printflike(x, y) __attribute((format(printf, (x), (y))))
-# else
-#  define __printflike(x, y)
-# endif
-#endif
-
-#ifndef __bounded__
-# define __bounded__(x, y, z)
-#endif
-
-#ifndef __RCSID
-# define __RCSID(x)
-#endif
-
-#ifndef __FBSDID
-# define __FBSDID(x)
-#endif
-
-#ifndef __RCSID
-# define __RCSID(x)
-#endif
-
-#ifndef __RCSID_SOURCE
-# define __RCSID_SOURCE
-#endif
-
-#ifndef __SCCSID
-# define __SCCSID
-#endif
-
-#ifndef __COPYRIGHT
-# define __COPYRIGHT
-#endif
 
 #endif
+

include/bsd/sys/cdefs.h

@@ -0,0 +1,92 @@
+/*
+ * Copyright © 2004, 2005, 2006, 2009 Guillem Jover
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef LIBBSD_CDEFS_H
+#define LIBBSD_CDEFS_H
+
+#include <sys/cdefs.h>
+
+#ifndef setproctitle
+# define setproctitle(fmt, args...)
+#endif
+
+#ifndef __dead2
+# define __dead2
+#endif
+
+#ifndef __pure2
+# define __pure2
+#endif
+
+/* Linux headers define a struct with a member names __unused.
+ * Disable for now. */
+#if 0
+#ifndef __unused
+# ifdef __GNUC__
+#  define __unused __attribute__((unused))
+# else
+#  define __unused
+# endif
+#endif
+#endif
+
+#ifndef __printflike
+# ifdef __GNUC__
+#  define __printflike(x, y) __attribute((format(printf, (x), (y))))
+# else
+#  define __printflike(x, y)
+# endif
+#endif
+
+#ifndef __bounded__
+# define __bounded__(x, y, z)
+#endif
+
+#ifndef __RCSID
+# define __RCSID(x)
+#endif
+
+#ifndef __FBSDID
+# define __FBSDID(x)
+#endif
+
+#ifndef __RCSID
+# define __RCSID(x)
+#endif
+
+#ifndef __RCSID_SOURCE
+# define __RCSID_SOURCE
+#endif
+
+#ifndef __SCCSID
+# define __SCCSID
+#endif
+
+#ifndef __COPYRIGHT
+# define __COPYRIGHT
+#endif
+
+#endif