Commit ac32eefec50a1f9a6c4a75b7467731fc99a0a109
2007-01-09T13:26:33
bsd/bsd.h: Cleanup
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 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76
diff --git a/include/bsd/bsd.h b/include/bsd/bsd.h
index 6218e4c..0367694 100644
--- a/include/bsd/bsd.h
+++ b/include/bsd/bsd.h
@@ -10,25 +10,17 @@
#include <bsd/string.h>
#include <bsd/queue.h>
#include <bsd/ip_icmp.h>
+#include <time.h>
/*
* Stuff to be moved.
*/
-#include <sys/types.h>
-
-typedef char * __va_list;
-#if !defined(__GNUC_VA_LIST)
-#define __GNUC_VA_LIST
-typedef __va_list __gnuc_va_list; /* compatibility w/ GNU headers */
-#endif
+#define __BSD_VISIBLE 1
+#define __XSI_VISIBLE 1
+#include <sys/limits.h>
-extern time_t time (time_t *__timer) __THROW;
-
-struct __sbuf {
- unsigned char *_base;
- int _size;
-};
+#include <sys/types.h>
#define MLD_LISTENER_QUERY 130 /* multicast listener query */
#define MLD_LISTENER_REPORT 131 /* multicast listener report */
@@ -46,40 +38,4 @@ struct __sbuf {
#define ND_REDIRECT_ONLINK 0 /* redirect to an on-link node */
#define ND_REDIRECT_ROUTER 1 /* redirect to a better router */
-/*
- * Limits.
- */
-
-#define GID_MAX UINT_MAX /* max value for a gid_t */
-#define UID_MAX UINT_MAX /* max value for a uid_t */
-
-#define SIZE_T_MAX __SIZE_T_MAX /* max value for a size_t */
-
-// This depends on the arch, so this must be ported in other manner
-#define __SIZE_T_MAX __UINT_MAX /* max value for a size_t */
-#define __UINT_MAX 0xffffffffU /* max value for an unsigned int */
-
-/*
- * Endianness.
- */
-
-#define HTONL(x) (x) = htonl((__uint32_t)(x))
-
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-#define be64toh(x) bswap64((x))
-#else /* _BYTE_ORDER != _LITTLE_ENDIAN */
-#define be64toh(x) ((uint64_t)(x))
-#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */
-
-#define bswap64(x) __bswap64(x)
-
-static __inline __uint64_t
-__bswap64(__uint64_t _x)
-{
- return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) |
- ((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) |
- ((_x << 24) & ((__uint64_t)0xff << 40)) |
- ((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56)));
-}
-
#endif