Move some macros to cdefs.h

ChangeLog

@@ -1,3 +1,11 @@
+2006-02-14  Guillem Jover  <guillem@debian.org>
+
+	* include/bsd/bsd.h (setproctitle, __dead2, __unused, __printflike)
+	(__FBSDID): Moved to ...
+	* include/bsd/cdefs.h: ... here.
+	(__unused, __printflike) [__GNUC__]: Use proper __attribute__.
+	* Makefile (LIB_INCLUDES): Add 'cdefs.h'.
+
 2006-02-14  Guillem Jover  <guillem@debian.org>
 
 	* arc4random.c: Move to ...

Makefile

@@ -9,7 +9,7 @@ LIB_SRCS := arc4random.c bsd_getopt.c err.c fgetln.c inet_net_pton.c \
 LIB_SRCS := $(patsubst %,src/%,$(LIB_SRCS))
 
 LIB_INCLUDES := err.h getopt.h ip_icmp.h random.h queue.h md5.h string.h \
-		bsd.h stdlib.h
+		bsd.h cdefs.h stdlib.h
 LIB_INCLUDES := $(patsubst %,include/bsd/%,$(LIB_INCLUDES))
 
 LIB_MANS := arc4random.3 strlcpy.3 fgetln.3 fmtcheck.3

include/bsd/bsd.h

@@ -1,23 +1,11 @@
 #ifndef LIBBSD_H
 #define LIBBSD_H
 
-/*
- * Generic definitions.
- */
-
-#define setproctitle(fmt, args...)
-
-#define __dead2
-#define __unused
-#define __printflike(x,y)
-#define __FBSDID(x)
-
-#include <sys/cdefs.h>
-
 /*
  * Include all bsd compat headers.
  */
 
+#include <bsd/cdefs.h>
 #include <bsd/random.h>
 #include <bsd/string.h>
 #include <bsd/queue.h>

include/bsd/cdefs.h

@@ -0,0 +1,34 @@
+#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 __unused
+# ifdef __GNUC__
+#  define __unused __attribute__((unused))
+# else
+#  define __unused
+# endif
+#endif
+
+#ifndef __printflike
+# ifdef __GNUC__
+#  define __printflike(x, y) __attribute((format(printf, (x), (y))))
+# else
+#  define __printflike(x, y)
+# endif
+#endif
+
+#ifndef __FBSDID
+# define __FBSDID(x)
+#endif
+
+#endif