diff options
author | Guillem Jover <guillem@hadrons.org> | 2009-12-11 23:12:26 +0100 |
---|---|---|
committer | Guillem Jover <guillem@hadrons.org> | 2009-12-12 01:11:08 +0100 |
commit | 3c9182b85e785159b349106c04ccc1b4ec045350 (patch) | |
tree | 9823107df4f40437f8c8012e062ff0ef2621bcf3 /include/bsd | |
parent | 4d17a18db559a3e3485d049cddf808090f38e8be (diff) | |
download | libbsd-3c9182b85e785159b349106c04ccc1b4ec045350.tar.gz |
Move arc4random declarations to <bsd/stdlib.h>
This is were they are located on the BSDs.
Diffstat (limited to 'include/bsd')
-rw-r--r-- | include/bsd/bsd.h | 1 | ||||
-rw-r--r-- | include/bsd/random.h | 9 | ||||
-rw-r--r-- | include/bsd/stdlib.h | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/include/bsd/bsd.h b/include/bsd/bsd.h index 237fe16..437cccc 100644 --- a/include/bsd/bsd.h +++ b/include/bsd/bsd.h @@ -39,7 +39,6 @@ #include <bsd/string.h> #include <bsd/err.h> #include <bsd/getopt.h> -#include <bsd/random.h> #include <bsd/md5.h> #include <time.h> diff --git a/include/bsd/random.h b/include/bsd/random.h index f76adea..f4ef7d3 100644 --- a/include/bsd/random.h +++ b/include/bsd/random.h @@ -27,14 +27,9 @@ #ifndef LIBBSD_RANDOM_H #define LIBBSD_RANDOM_H -#include <sys/cdefs.h> -#include <sys/types.h> +#warning "This header is deprecated, use the one in bsd/stdlib.h instead." -__BEGIN_DECLS -u_int32_t arc4random(); -void arc4random_stir(); -void arc4random_addrandom(u_char *dat, int datlen); -__END_DECLS +#include <bsd/stdlib.h> #endif diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h index 453c33d..2357334 100644 --- a/include/bsd/stdlib.h +++ b/include/bsd/stdlib.h @@ -38,6 +38,10 @@ #include <libutil.h> __BEGIN_DECLS +u_int32_t arc4random(); +void arc4random_stir(); +void arc4random_addrandom(u_char *dat, int datlen); + int dehumanize_number(const char *str, int64_t *size); const char *fmtcheck (const char *, const char *); |