diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
| commit | f6bad5ef766b0447158e3de2f55c35f1f6cecb58 (patch) | |
| tree | f5ec7ac45234c25794c97f87e9a6daa8a551e57c /libbb/messages.c | |
| parent | 72394258b6509b40e0fa08594ac86215a558dfd8 (diff) | |
| parent | 8d0e0cdadf726beab28ccdc7d69738c1534e1f74 (diff) | |
| download | busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.gz busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.bz2 busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.zip | |
Merge commit '8d0e0cdadf726beab28ccdc7d69738c1534e1f74' into merge
Conflicts:
include/platform.h
libbb/Kbuild.src
libbb/messages.c
Diffstat (limited to 'libbb/messages.c')
| -rw-r--r-- | libbb/messages.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libbb/messages.c b/libbb/messages.c index 3c3ec3519..9e7bd0fef 100644 --- a/libbb/messages.c +++ b/libbb/messages.c | |||
| @@ -50,17 +50,16 @@ const int const_int_1 = 1; | |||
| 50 | * and it will end up in bss */ | 50 | * and it will end up in bss */ |
| 51 | const int const_int_0 = 0; | 51 | const int const_int_0 = 0; |
| 52 | 52 | ||
| 53 | #if !ENABLE_PLATFORM_MINGW32 /* No wtmp on Windows */ | 53 | #if ENABLE_FEATURE_WTMP |
| 54 | #include <utmp.h> | ||
| 55 | /* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */ | 54 | /* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */ |
| 56 | const char bb_path_wtmp_file[] ALIGN1 = | 55 | const char bb_path_wtmp_file[] ALIGN1 = |
| 57 | #if defined _PATH_WTMP | 56 | # if defined _PATH_WTMP |
| 58 | _PATH_WTMP; | 57 | _PATH_WTMP; |
| 59 | #elif defined WTMP_FILE | 58 | # elif defined WTMP_FILE |
| 60 | WTMP_FILE; | 59 | WTMP_FILE; |
| 61 | #else | 60 | # else |
| 62 | #error unknown path to wtmp file | 61 | # error unknown path to wtmp file |
| 63 | #endif | 62 | # endif |
| 64 | #endif | 63 | #endif |
| 65 | 64 | ||
| 66 | /* We use it for "global" data via *(struct global*)&bb_common_bufsiz1. | 65 | /* We use it for "global" data via *(struct global*)&bb_common_bufsiz1. |