diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-01-25 23:21:46 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-01-25 23:21:46 +0100 |
commit | 8d0e0cdadf726beab28ccdc7d69738c1534e1f74 (patch) | |
tree | 73eec58affb5ac0b6d8e97fb36e9f0beb11da00d /libbb | |
parent | 9aa599dc9dc076f6fa6e4312e4750a703cf16450 (diff) | |
download | busybox-w32-8d0e0cdadf726beab28ccdc7d69738c1534e1f74.tar.gz busybox-w32-8d0e0cdadf726beab28ccdc7d69738c1534e1f74.tar.bz2 busybox-w32-8d0e0cdadf726beab28ccdc7d69738c1534e1f74.zip |
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.c | 11 | ||||
-rw-r--r-- | libbb/utmp.c | 1 |
2 files changed, 6 insertions, 6 deletions
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; | |||
48 | * and it will end up in bss */ | 48 | * and it will end up in bss */ |
49 | const int const_int_0 = 0; | 49 | const int const_int_0 = 0; |
50 | 50 | ||
51 | #include <utmp.h> | 51 | #if ENABLE_FEATURE_WTMP |
52 | /* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */ | 52 | /* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */ |
53 | const char bb_path_wtmp_file[] ALIGN1 = | 53 | const char bb_path_wtmp_file[] ALIGN1 = |
54 | #if defined _PATH_WTMP | 54 | # if defined _PATH_WTMP |
55 | _PATH_WTMP; | 55 | _PATH_WTMP; |
56 | #elif defined WTMP_FILE | 56 | # elif defined WTMP_FILE |
57 | WTMP_FILE; | 57 | WTMP_FILE; |
58 | #else | 58 | # else |
59 | #error unknown path to wtmp file | 59 | # error unknown path to wtmp file |
60 | # endif | ||
60 | #endif | 61 | #endif |
61 | 62 | ||
62 | /* We use it for "global" data via *(struct global*)&bb_common_bufsiz1. | 63 | /* 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 @@ | |||
7 | * Licensed under GPLv2, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | #include "libbb.h" | 9 | #include "libbb.h" |
10 | #include <utmp.h> | ||
11 | 10 | ||
12 | static void touch(const char *filename) | 11 | static void touch(const char *filename) |
13 | { | 12 | { |