randomconfig fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/include/libbb.h b/include/libbb.h
index 6e629d187e2e4d653b4eb47fbca18d8135b72794..97dbe86875fe2e3f24b10772b8fea28a6ac23a41 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1271,6 +1271,7 @@ line_input_t *new_line_input_t(int flags) FAST_FUNC;
  */
 int read_line_input(const char* prompt, char* command, int maxsize, line_input_t *state) FAST_FUNC;
 #else
+#define MAX_HISTORY 0
 int read_line_input(const char* prompt, char* command, int maxsize) FAST_FUNC;
 #define read_line_input(prompt, command, maxsize, state) \
        read_line_input(prompt, command, maxsize)

diff --git a/networking/telnetd.c b/networking/telnetd.c
index 2a0ace5cb79ce4dc50f7733af86e5d8fcc9c16b1..163efaa4213f5f6406838319ca280f8930ce1fdb 100644 (file)
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -562,13 +562,15 @@ int telnetd_main(int argc UNUSED_PARAM, char **argv)
        }
 
        {
-               struct timeval tv;
                struct timeval *tv_ptr = NULL;
+#if ENABLE_FEATURE_TELNETD_INETD_WAIT
+               struct timeval tv;
                if ((opt & OPT_WAIT) && !G.sessions) {
                        tv.tv_sec = sec_linger;
                        tv.tv_usec = 0;
                        tv_ptr = &tv;
                }
+#endif
                count = select(G.maxfd + 1, &rdfdset, &wrfdset, NULL, tv_ptr);
        }
        if (count == 0) /* "telnetd -w SEC" timed out */

diff --git a/procps/top.c b/procps/top.c
index 9e8ad1d1f06b364b0267015480d30797832f41d6..252f6f74b8907d0c3e1ddb74e8a6848a53e88ae0 100644 (file)
--- a/procps/top.c
+++ b/procps/top.c
@@ -513,8 +513,8 @@ static NOINLINE void display_process_list(int lines_rem, int scr_width)
        /* xxx_shift and xxx_scale variables allow us to replace
         * expensive divides with multiply and shift */
        unsigned pmem_shift, pmem_scale, pmem_half;
-       unsigned tmp_unsigned;
 #if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+       unsigned tmp_unsigned;
        unsigned pcpu_shift, pcpu_scale, pcpu_half;
        unsigned busy_jifs;
 #endif

diff --git a/shell/ash.c b/shell/ash.c
index d81dbd3f5c1985de192cd48c69721a80d01e353e..481b84138dbed7da9286ca525934f34097d3fa08 100644 (file)
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -53,6 +53,8 @@
 #include "math.h"
 #if ENABLE_ASH_RANDOM_SUPPORT
 # include "random.h"
+#else
+# define CLEAR_RANDOM_T(rnd) ((void)0)
 #endif
 
 #if defined SINGLE_APPLET_MAIN