diff options
| author | Ron Yorston <rmy@pobox.com> | 2015-01-23 09:50:40 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2015-01-23 09:50:40 +0000 |
| commit | 63dbf1908bc51918d9d963f4d9b7657306b2970d (patch) | |
| tree | 781ebfdcbbb953688e06f3541ce9e0c71f1dadfa /include | |
| parent | 06900749637b925af1ebdf5030ba03a379f4f84f (diff) | |
| parent | 6968e081230fb6434a2a6f0eed39d538ea982f3f (diff) | |
| download | busybox-w32-TIG_1_23_0.tar.gz busybox-w32-TIG_1_23_0.tar.bz2 busybox-w32-TIG_1_23_0.zip | |
Merge commit '1_23_0' into mergeTIG_1_23_0
Conflicts:
libbb/lineedit.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h index 802779932..2850b1d5a 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -1287,7 +1287,9 @@ char *bb_simplify_path(const char *path) FAST_FUNC; | |||
| 1287 | /* Returns ptr to NUL */ | 1287 | /* Returns ptr to NUL */ |
| 1288 | char *bb_simplify_abs_path_inplace(char *path) FAST_FUNC; | 1288 | char *bb_simplify_abs_path_inplace(char *path) FAST_FUNC; |
| 1289 | 1289 | ||
| 1290 | #ifndef LOGIN_FAIL_DELAY | ||
| 1290 | #define LOGIN_FAIL_DELAY 3 | 1291 | #define LOGIN_FAIL_DELAY 3 |
| 1292 | #endif | ||
| 1291 | extern void bb_do_delay(int seconds) FAST_FUNC; | 1293 | extern void bb_do_delay(int seconds) FAST_FUNC; |
| 1292 | extern void change_identity(const struct passwd *pw) FAST_FUNC; | 1294 | extern void change_identity(const struct passwd *pw) FAST_FUNC; |
| 1293 | extern void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args) NORETURN FAST_FUNC; | 1295 | extern void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args) NORETURN FAST_FUNC; |