diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:21:20 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:21:20 +0000 |
| commit | 0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (patch) | |
| tree | 6709ddd6071a9c238ba69233540bbcfe560c6a44 /editors/diff.c | |
| parent | 67758035a4fe040c6ac69b39d61bcd6bddd7b827 (diff) | |
| parent | 56a3b82e9692a25ef9c9269e88feac0d579ce8e8 (diff) | |
| download | busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.tar.gz busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.tar.bz2 busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.zip | |
Merge commit '56a3b82e9692a25ef9c9269e88feac0d579ce8e8' into merge
Conflicts:
coreutils/ls.c
include/platform.h
libbb/bb_basename.c
Diffstat (limited to 'editors/diff.c')
| -rw-r--r-- | editors/diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/diff.c b/editors/diff.c index daa58af9b..8b1e92783 100644 --- a/editors/diff.c +++ b/editors/diff.c | |||
| @@ -101,9 +101,9 @@ | |||
| 101 | #include "libbb.h" | 101 | #include "libbb.h" |
| 102 | 102 | ||
| 103 | #if 0 | 103 | #if 0 |
| 104 | //#define dbg_error_msg(...) bb_error_msg(__VA_ARGS__) | 104 | # define dbg_error_msg(...) bb_error_msg(__VA_ARGS__) |
| 105 | #else | 105 | #else |
| 106 | #define dbg_error_msg(...) ((void)0) | 106 | # define dbg_error_msg(...) ((void)0) |
| 107 | #endif | 107 | #endif |
| 108 | 108 | ||
| 109 | enum { /* print_status() and diffreg() return values */ | 109 | enum { /* print_status() and diffreg() return values */ |