[git commit] Fix compile failures
Denys Vlasenko
vda.linux at googlemail.com
Fri May 2 05:18:55 UTC 2014
commit: http://git.busybox.net/busybox/commit/?id=fe33683c8bad841a1b5e947fcc6a502b85ca53cf
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
libbb/verror_msg.c | 2 ++
miscutils/less.c | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/libbb/verror_msg.c b/libbb/verror_msg.c
index 87efb56..0ef2a31 100644
--- a/libbb/verror_msg.c
+++ b/libbb/verror_msg.c
@@ -11,7 +11,9 @@
# include <syslog.h>
#endif
+#if ENABLE_FEATURE_SYSLOG
smallint syslog_level = LOG_ERR;
+#endif
smallint logmode = LOGMODE_STDIO;
const char *msg_eol = "\n";
diff --git a/miscutils/less.c b/miscutils/less.c
index 36d0a0b..d84df46 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -456,7 +456,7 @@ static void read_lines(void)
readeof = eof_error;
if (eof_error <= 0)
goto reached_eof;
- had_progress = 1;
+ IF_FEATURE_LESS_REGEXP(had_progress = 1;)
}
c = readbuf[readpos];
/* backspace? [needed for manpages] */
More information about the busybox-cvs
mailing list