diff options
author | Ron Yorston <rmy@pobox.com> | 2019-02-17 16:08:01 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2019-02-17 16:11:32 +0000 |
commit | b1dcae0da4f5e9713fd54678ec42709a1744474b (patch) | |
tree | 57581923b3262e661ee2cd4ae627d66f06ca1aee /libbb | |
parent | 743580b4c029e200b1390075a1328ab314973bc2 (diff) | |
download | busybox-w32-b1dcae0da4f5e9713fd54678ec42709a1744474b.tar.gz busybox-w32-b1dcae0da4f5e9713fd54678ec42709a1744474b.tar.bz2 busybox-w32-b1dcae0da4f5e9713fd54678ec42709a1744474b.zip |
win32: fix POSIX build
There were a few places where changes intended for the WIN32 build
also affected the POSIX build. Fix these so the result of 'make
defconfig; make' for busybox-w32 is identical to upstream BusyBox.
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/appletlib.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c index be243de79..b7e5e3f1f 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c | |||
@@ -160,7 +160,11 @@ void FAST_FUNC bb_show_usage(void) | |||
160 | ap--; | 160 | ap--; |
161 | } | 161 | } |
162 | full_write2_str(bb_banner); | 162 | full_write2_str(bb_banner); |
163 | #if ENABLE_PLATFORM_MINGW32 | ||
163 | full_write2_str(" multi-call binary\n"); | 164 | full_write2_str(" multi-call binary\n"); |
165 | #else | ||
166 | full_write2_str(" multi-call binary.\n"); /* common string */ | ||
167 | #endif | ||
164 | if (*p == '\b') | 168 | if (*p == '\b') |
165 | full_write2_str("\nNo help available\n"); | 169 | full_write2_str("\nNo help available\n"); |
166 | else { | 170 | else { |
@@ -869,7 +873,11 @@ int busybox_main(int argc UNUSED_PARAM, char **argv) | |||
869 | 873 | ||
870 | dup2(1, 2); | 874 | dup2(1, 2); |
871 | full_write2_str(bb_banner); /* reuse const string */ | 875 | full_write2_str(bb_banner); /* reuse const string */ |
876 | #if ENABLE_PLATFORM_MINGW32 | ||
872 | full_write2_str(" multi-call binary\n"); /* reuse */ | 877 | full_write2_str(" multi-call binary\n"); /* reuse */ |
878 | #else | ||
879 | full_write2_str(" multi-call binary.\n"); /* reuse */ | ||
880 | #endif | ||
873 | #if defined(MINGW_VER) | 881 | #if defined(MINGW_VER) |
874 | if (sizeof(MINGW_VER) > 5) { | 882 | if (sizeof(MINGW_VER) > 5) { |
875 | full_write2_str(MINGW_VER "\n\n"); | 883 | full_write2_str(MINGW_VER "\n\n"); |