diff options
| author | Guillem Jover <guillem@hadrons.org> | 2006-02-14 06:43:04 +0000 |
|---|---|---|
| committer | Guillem Jover <guillem@hadrons.org> | 2008-05-06 08:50:47 +0300 |
| commit | 815047342080dc3e8eff1daac0a4694d06e1ae03 (patch) | |
| tree | b539e5931ed39a8e4d0c534931ffd7b63ca7f15e | |
| parent | 5372b7368573739ee3bd38c5bb76b187e8241279 (diff) | |
| download | libbsd-815047342080dc3e8eff1daac0a4694d06e1ae03.tar.gz | |
Move some macros to cdefs.h
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | include/bsd/bsd.h | 14 | ||||
| -rw-r--r-- | include/bsd/cdefs.h | 34 |
4 files changed, 44 insertions, 14 deletions
@@ -1,5 +1,13 @@ 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 ... * src/arc4random.c: ... here. * bsd_getopt.c: Move to ... @@ -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 diff --git a/include/bsd/bsd.h b/include/bsd/bsd.h index 6dabec4..57690a1 100644 --- a/include/bsd/bsd.h +++ b/include/bsd/bsd.h @@ -2,22 +2,10 @@ #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> diff --git a/include/bsd/cdefs.h b/include/bsd/cdefs.h new file mode 100644 index 0000000..a23e15e --- /dev/null +++ b/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 |