[BusyBox-cvs] busybox/include busybox.h, 1.52, 1.53 libbb.h, 1.104, 1.105

[Erik Andersen]

Update of /var/cvs/busybox/include
In directory winder:/tmp/cvs-serv29080/include

Modified Files:
	busybox.h libbb.h 
Log Message:
Remove remaining libc5 support code


Index: busybox.h
===================================================================
RCS file: /var/cvs/busybox/include/busybox.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- busybox.h	8 Feb 2003 23:36:16 -0000	1.52
+++ busybox.h	22 Jul 2003 08:56:44 -0000	1.53
@@ -31,6 +31,12 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#if __GNU_LIBRARY__ < 5
+#ifndef __dietlibc__
+#error "Sorry, libc5 is not supported"
+#endif
+#endif
+
 #define BB_BANNER "BusyBox v" BB_VER " (" BB_BT ")"
 
 #ifdef DMALLOC
@@ -92,17 +98,6 @@
 #endif
 #endif
 
-
-/* Bit map related macros -- libc5 doens't provide these... sigh.  */
-#ifndef setbit
-#ifndef NBBY
-#define NBBY            CHAR_BIT
-#endif
-#define setbit(a,i)     ((a)[(i)/NBBY] |= 1<<((i)%NBBY))
-#define clrbit(a,i)     ((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-#define isset(a,i)      ((a)[(i)/NBBY] & (1<<((i)%NBBY)))
-#define isclr(a,i)      (((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-#endif
 
 #ifndef RB_POWER_OFF
 /* Stop system and switch power off if possible.  */

Index: libbb.h
===================================================================
RCS file: /var/cvs/busybox/include/libbb.h,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- libbb.h	22 Jul 2003 07:33:14 -0000	1.104
+++ libbb.h	22 Jul 2003 08:56:44 -0000	1.105
@@ -57,18 +57,6 @@
 # define inline
 #endif
 
-#if (__GNU_LIBRARY__ < 5) && (!defined __dietlibc__)
-/* libc5 doesn't define socklen_t */
-#ifndef _SOCKLEN_T
-#define _SOCKLEN_T
-typedef unsigned int socklen_t;
-#endif
-/* libc5 doesn't implement BSD 4.4 daemon() */
-extern int daemon (int nochdir, int noclose);
-/* libc5 doesn't implement strtok_r */
-char *strtok_r(char *s, const char *delim, char **ptrptr);
-#endif	
-
 /* Convenience macros to test the version of gcc. */
 #if defined __GNUC__ && defined __GNUC_MINOR__
 # define __GNUC_PREREQ(maj, min) \