summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko2011-01-25 23:21:46 +0100
committerDenys Vlasenko2011-01-25 23:21:46 +0100
commit8d0e0cdadf726beab28ccdc7d69738c1534e1f74 (patch)
tree73eec58affb5ac0b6d8e97fb36e9f0beb11da00d /libbb
parent9aa599dc9dc076f6fa6e4312e4750a703cf16450 (diff)
downloadbusybox-8d0e0cdadf726beab28ccdc7d69738c1534e1f74.zip
busybox-8d0e0cdadf726beab28ccdc7d69738c1534e1f74.tar.gz
move utmp.h include to libbb.h
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/messages.c11
-rw-r--r--libbb/utmp.c1
2 files changed, 6 insertions, 6 deletions
diff --git a/libbb/messages.c b/libbb/messages.c
index 66e466f..2acbc3b 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -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.
diff --git a/libbb/utmp.c b/libbb/utmp.c
index 2bf9c11..09443fb 100644
--- a/libbb/utmp.c
+++ b/libbb/utmp.c
@@ -7,7 +7,6 @@
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
#include "libbb.h"
-#include <utmp.h>
static void touch(const char *filename)
{