diff options
| author | Ron Yorston <rmy@pobox.com> | 2014-03-23 14:40:55 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2014-03-23 14:40:55 +0000 |
| commit | 7b9626a2d2735985ad5319d5c79529fa457454f0 (patch) | |
| tree | 8f9d5be0b406d1840ad7755b1465be2f944a837f | |
| parent | e62757fb05c794c7ad8356e6bbb22e2869b8b9b5 (diff) | |
| download | busybox-w32-7b9626a2d2735985ad5319d5c79529fa457454f0.tar.gz busybox-w32-7b9626a2d2735985ad5319d5c79529fa457454f0.tar.bz2 busybox-w32-7b9626a2d2735985ad5319d5c79529fa457454f0.zip | |
Remove unnecessary differences from upstream BusyBox
| -rw-r--r-- | libbb/Kbuild.src | 2 | ||||
| -rw-r--r-- | shell/ash.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index adaab92d6..d81ae8468 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src | |||
| @@ -97,9 +97,9 @@ lib-y += wfopen_input.o | |||
| 97 | lib-y += write.o | 97 | lib-y += write.o |
| 98 | lib-y += xatonum.o | 98 | lib-y += xatonum.o |
| 99 | lib-y += xconnect.o | 99 | lib-y += xconnect.o |
| 100 | lib-y += xfunc_die.o | ||
| 101 | lib-y += xfuncs.o | 100 | lib-y += xfuncs.o |
| 102 | lib-y += xfuncs_printf.o | 101 | lib-y += xfuncs_printf.o |
| 102 | lib-y += xfunc_die.o | ||
| 103 | lib-y += xgetcwd.o | 103 | lib-y += xgetcwd.o |
| 104 | lib-y += xreadlink.o | 104 | lib-y += xreadlink.o |
| 105 | lib-y += xrealloc_vector.o | 105 | lib-y += xrealloc_vector.o |
diff --git a/shell/ash.c b/shell/ash.c index 2fc276e78..0b6be4aff 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -51,7 +51,6 @@ | |||
| 51 | 51 | ||
| 52 | #define JOBS ENABLE_ASH_JOB_CONTROL | 52 | #define JOBS ENABLE_ASH_JOB_CONTROL |
| 53 | 53 | ||
| 54 | #include "busybox.h" /* for applet_names */ | ||
| 55 | #include <paths.h> | 54 | #include <paths.h> |
| 56 | #include <setjmp.h> | 55 | #include <setjmp.h> |
| 57 | #include <fnmatch.h> | 56 | #include <fnmatch.h> |