Commit 3c9182b85e785159b349106c04ccc1b4ec045350
2009-12-11T23:12:26
Move arc4random declarations to <bsd/stdlib.h> This is were they are located on the BSDs.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
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 *);