From 8d0e0cdadf726beab28ccdc7d69738c1534e1f74 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 25 Jan 2011 23:21:46 +0100 Subject: move utmp.h include to libbb.h Signed-off-by: Denys Vlasenko --- libbb/messages.c | 11 ++++++----- libbb/utmp.c | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libbb') diff --git a/libbb/messages.c b/libbb/messages.c index 66e466ffa..2acbc3bca 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 +#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 2bf9c11f2..09443fb6c 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 static void touch(const char *filename) { -- cgit v1.2.3