udhcpc: fix a problem with binary-encoded options #2

[oweals/busybox.git] / libbb / messages.c

diff --git a/libbb/messages.c b/libbb/messages.c
index 66e466ffa4bcb866d3c3b2fece74db8b9e4b730e..fad82c9dabce5479e8787cbc739590063b59a378 100644 (file)
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -22,7 +22,7 @@
 const char bb_banner[] ALIGN1 = BANNER;
 
 
-const char bb_msg_memory_exhausted[] ALIGN1 = "memory exhausted";
+const char bb_msg_memory_exhausted[] ALIGN1 = "out of memory";
 const char bb_msg_invalid_date[] ALIGN1 = "invalid date '%s'";
 const char bb_msg_unknown[] ALIGN1 = "(unknown)";
 const char bb_msg_can_not_create_raw_socket[] ALIGN1 = "can't create raw socket";
@@ -48,15 +48,16 @@ const int const_int_1 = 1;
  * and it will end up in bss */
 const int const_int_0 = 0;
 
-#include <utmp.h>
+#if ENABLE_FEATURE_WTMP
 /* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */
 const char bb_path_wtmp_file[] ALIGN1 =
-#if defined _PATH_WTMP
+# if defined _PATH_WTMP
        _PATH_WTMP;
-#elif defined WTMP_FILE
+# elif defined WTMP_FILE
        WTMP_FILE;
-#else
-#error unknown path to wtmp file
+# else
+#  error unknown path to wtmp file
+# endif
 #endif
 
 /* We use it for "global" data via *(struct global*)&bb_common_bufsiz1.