Fixed failure to build of busybox due to conflicting symbols

with bionic by renaming said symbols in busybox. Also removed an
unnecessary typedef for bionic

Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>

diff --git a/include/android.h b/include/android.h
index c81ae47..6a5ccd3 100644 (file)
--- a/include/android.h
+++ b/include/android.h
@@ -11,7 +11,7 @@
 /* for dirname, basename */
 #include <libgen.h>
 
-#define killpg(P, S) kill(-(P), S)
+#define killpg_busybox(P, S) kill(-(P), S)
 
 #define setmntent fopen
 #define endmntent fclose

diff --git a/shell/ash.c b/shell/ash.c
index d659781..cb98738 100644 (file)
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -3622,7 +3622,7 @@ setjobctl(int on)
                        }
                        if (pgrp == getpgrp())
                                break;
-                       killpg(0, SIGTTIN);
+                       killpg_busybox(0, SIGTTIN);
                } while (1);
                initialpgrp = pgrp;
 
@@ -3702,7 +3702,7 @@ restartjob(struct job *jp, int mode)
        pgid = jp->ps[0].ps_pid;
        if (mode == FORK_FG)
                xtcsetpgrp(ttyfd, pgid);
-       killpg(pgid, SIGCONT);
+       killpg_busybox(pgid, SIGCONT);
        ps = jp->ps;
        i = jp->nprocs;
        do {
@@ -12481,8 +12481,6 @@ letcmd(int argc UNUSED_PARAM, char **argv)
 
 #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 1
 typedef enum __rlimit_resource rlim_t;
-#elif defined(__BIONIC__)
-typedef unsigned long rlim_t;
 #endif
 
 /*