[BusyBox] [PATCH] Apologies for the prev nonworking patch. This time a working one.

[mathuria]

Hi All,

I recently realised that the patch in my previuos mail was not working
fine. My apologies for the inconvienience. This time, I have double
checked on my Solaris machine and the patch works fine.

Once again, sorry for all these.

Thanks & Regards,
Mihir.
-------------- next part --------------
--- include/libbb.h	2003-01-30 15:49:13.024905000 -0800
+++ include/libbb1.h	2003-01-30 15:47:32.450762000 -0800
@@ -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 */
--- include/busybox.h	2003-01-30 15:48:50.096232000 -0800
+++ include/busybox1.h	2003-01-30 15:47:41.670222000 -0800
@@ -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)))
--- fileutils/chown.c	2003-01-30 22:09:43.756577000 -0800
+++ fileutils/chown1.c	2003-01-30 22:09:23.047742000 -0800
@@ -35,7 +35,7 @@
 static long uid;
 static long gid;
 
-static int (*chown_func)(const char *, __uid_t, __gid_t) = chown;
+static int (*chown_func)(const char *, uid_t, gid_t) = chown;
 
 static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 {