[Glibc-bsd-commits] r1859 - in trunk/libbsd: debian include/bsd

[Petr Salinger]

Author: ps-guest
Date: 2007-01-09 14:26:33 +0100 (Tue, 09 Jan 2007)
New Revision: 1859

Modified:
   trunk/libbsd/debian/changelog
   trunk/libbsd/include/bsd/bsd.h
Log:
* revamped <bsd/bsd.h>



Modified: trunk/libbsd/debian/changelog
===================================================================
--- trunk/libbsd/debian/changelog	2007-01-09 12:25:00 UTC (rev 1858)
+++ trunk/libbsd/debian/changelog	2007-01-09 13:26:33 UTC (rev 1859)
@@ -1,6 +1,8 @@
-libbsd (0.0-1.3) unreleased; urgency=low
+libbsd (0.0-1.3) UNRELEASED; urgency=low
+  
+  [ Petr Salinger ]
 
-  * new release.
+  * revamped <bsd/bsd.h>
 
  -- Hector Garcia <hector at debian.org>  Sun, 17 Jul 2005 16:17:35 +0200
 

Modified: trunk/libbsd/include/bsd/bsd.h
===================================================================
--- trunk/libbsd/include/bsd/bsd.h	2007-01-09 12:25:00 UTC (rev 1858)
+++ trunk/libbsd/include/bsd/bsd.h	2007-01-09 13:26:33 UTC (rev 1859)
@@ -10,26 +10,18 @@
 #include <bsd/string.h>
 #include <bsd/queue.h>
 #include <bsd/ip_icmp.h>
+#include <time.h>
 
 /*
  * Stuff to be moved.
  */
 
+#define __BSD_VISIBLE	1
+#define __XSI_VISIBLE	1 
+#include <sys/limits.h>
+
 #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
-
-extern time_t time (time_t *__timer) __THROW;
-
-struct __sbuf {
-        unsigned char *_base;
-        int     _size;
-};
-
 #define MLD_LISTENER_QUERY              130     /* multicast listener query */
 #define MLD_LISTENER_REPORT             131     /* multicast listener report */
 #define MLD_LISTENER_DONE               132     /* multicast listener done */
@@ -46,40 +38,4 @@
 #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