Move arc4random declarations to <bsd/stdlib.h>

This is were they are located on the BSDs.

diff --git a/include/bsd/bsd.h b/include/bsd/bsd.h
index 237fe1693a83d1a9bfc933e30413cb07d75b5dcb..437cccc775772103891a358f01d975ee903e0707 100644 (file)
--- 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 f76adea062f797bb8450f56fe371c957230a259f..f4ef7d31baa16cbd98019a0ace233ee5d2f63749 100644 (file)
--- 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 453c33dc8aa438ad696ff55ca93021a7eaf0a787..2357334d911f295c2b536705a402386ac8623f95 100644 (file)
--- 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 *);