diff options
Diffstat (limited to 'libbb/messages.c')
-rw-r--r-- | libbb/messages.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libbb/messages.c b/libbb/messages.c index 44b39942f..0c13449c0 100644 --- a/libbb/messages.c +++ b/libbb/messages.c | |||
@@ -44,7 +44,11 @@ const char bb_path_group_file[] ALIGN1 = "/etc/group"; | |||
44 | const char bb_path_gshadow_file[] ALIGN1 = "/etc/gshadow"; | 44 | const char bb_path_gshadow_file[] ALIGN1 = "/etc/gshadow"; |
45 | const char bb_path_motd_file[] ALIGN1 = "/etc/motd"; | 45 | const char bb_path_motd_file[] ALIGN1 = "/etc/motd"; |
46 | const char bb_dev_null[] ALIGN1 = "/dev/null"; | 46 | const char bb_dev_null[] ALIGN1 = "/dev/null"; |
47 | #if ENABLE_PLATFORM_MINGW32 | ||
48 | /* bb_busybox_exec_path is redefined to get_busybox_exec_path() in libbb.h */ | ||
49 | #else | ||
47 | const char bb_busybox_exec_path[] ALIGN1 = CONFIG_BUSYBOX_EXEC_PATH; | 50 | const char bb_busybox_exec_path[] ALIGN1 = CONFIG_BUSYBOX_EXEC_PATH; |
51 | #endif | ||
48 | const char bb_default_login_shell[] ALIGN1 = LIBBB_DEFAULT_LOGIN_SHELL; | 52 | const char bb_default_login_shell[] ALIGN1 = LIBBB_DEFAULT_LOGIN_SHELL; |
49 | /* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin, | 53 | /* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin, |
50 | * but I want to save a few bytes here. Check libbb.h before changing! */ | 54 | * but I want to save a few bytes here. Check libbb.h before changing! */ |
@@ -57,6 +61,7 @@ const int const_int_1 = 1; | |||
57 | * and it will end up in bss */ | 61 | * and it will end up in bss */ |
58 | const int const_int_0 = 0; | 62 | const int const_int_0 = 0; |
59 | 63 | ||
64 | #if !ENABLE_PLATFORM_MINGW32 /* No wtmp on Windows */ | ||
60 | #include <utmp.h> | 65 | #include <utmp.h> |
61 | /* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */ | 66 | /* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */ |
62 | const char bb_path_wtmp_file[] ALIGN1 = | 67 | const char bb_path_wtmp_file[] ALIGN1 = |
@@ -67,6 +72,7 @@ const char bb_path_wtmp_file[] ALIGN1 = | |||
67 | #else | 72 | #else |
68 | #error unknown path to wtmp file | 73 | #error unknown path to wtmp file |
69 | #endif | 74 | #endif |
75 | #endif | ||
70 | 76 | ||
71 | /* We use it for "global" data via *(struct global*)&bb_common_bufsiz1. | 77 | /* We use it for "global" data via *(struct global*)&bb_common_bufsiz1. |
72 | * Since gcc insists on aligning struct global's members, it would be a pity | 78 | * Since gcc insists on aligning struct global's members, it would be a pity |