[BusyBox-cvs] busybox/include busybox.h,1.51,1.52 libbb.h,1.93,1.94

[Glenn McGrath]

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

Modified Files:
	busybox.h libbb.h 
Log Message:
Patch from mathuria, compatability with solaris


Index: busybox.h
===================================================================
RCS file: /var/cvs/busybox/include/busybox.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- busybox.h	22 Aug 2002 15:54:22 -0000	1.51
+++ busybox.h	8 Feb 2003 23:36:16 -0000	1.52
@@ -95,7 +95,9 @@
 
 /* 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)))

Index: libbb.h
===================================================================
RCS file: /var/cvs/busybox/include/libbb.h,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- libbb.h	21 Jan 2003 20:55:53 -0000	1.93
+++ libbb.h	8 Feb 2003 23:36:16 -0000	1.94
@@ -55,7 +55,10 @@
 
 #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 */