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 /debianutils | |
| 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 'debianutils')
| -rw-r--r-- | debianutils/pipe_progress.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/debianutils/pipe_progress.c b/debianutils/pipe_progress.c index fd08a145e..28c4fd70e 100644 --- a/debianutils/pipe_progress.c +++ b/debianutils/pipe_progress.c | |||
| @@ -16,10 +16,11 @@ | |||
| 16 | 16 | ||
| 17 | //kbuild:lib-$(CONFIG_PIPE_PROGRESS) += pipe_progress.o | 17 | //kbuild:lib-$(CONFIG_PIPE_PROGRESS) += pipe_progress.o |
| 18 | 18 | ||
| 19 | //usage:#define pipe_progress_trivial_usage | 19 | //usage:#define pipe_progress_trivial_usage IF_PLATFORM_POSIX(NOUSAGE_STR) |
| 20 | //usage: "" | 20 | //usage: IF_PLATFORM_MINGW32("") |
| 21 | //usage:#define pipe_progress_full_usage "\n\n" | 21 | //usage:#define pipe_progress_full_usage IF_PLATFORM_POSIX("") |
| 22 | //usage: "Display a dot to indicate pipe activity" | 22 | //usage: IF_PLATFORM_MINGW32("\n\n") |
| 23 | //usage: IF_PLATFORM_MINGW32("Display a dot to indicate pipe activity") | ||
| 23 | 24 | ||
| 24 | #include "libbb.h" | 25 | #include "libbb.h" |
| 25 | 26 | ||