diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 14:09:23 +1000 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 14:09:23 +1000 |
commit | ee7c9b2c212fc7db80cce945e094fc2601092283 (patch) | |
tree | 24e51b27dbc3e9ab0b00c5839a6822604c02187c /include/libbb.h | |
parent | f28d4b20905b5b1f52ffa52060a0c6caf4b055ba (diff) | |
parent | 99862cbfad9c36b4f8f4378c3a7a9f077c239f20 (diff) | |
download | busybox-w32-ee7c9b2c212fc7db80cce945e094fc2601092283.tar.gz busybox-w32-ee7c9b2c212fc7db80cce945e094fc2601092283.tar.bz2 busybox-w32-ee7c9b2c212fc7db80cce945e094fc2601092283.zip |
Merge remote branch 'origin/master'
Diffstat (limited to 'include/libbb.h')
-rw-r--r-- | include/libbb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/libbb.h b/include/libbb.h index 75f12467e..31e733d77 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -897,9 +897,9 @@ int spawn_and_wait(char **argv) FAST_FUNC; | |||
897 | struct nofork_save_area { | 897 | struct nofork_save_area { |
898 | jmp_buf die_jmp; | 898 | jmp_buf die_jmp; |
899 | const char *applet_name; | 899 | const char *applet_name; |
900 | int xfunc_error_retval; | ||
901 | uint32_t option_mask32; | 900 | uint32_t option_mask32; |
902 | int die_sleep; | 901 | int die_sleep; |
902 | uint8_t xfunc_error_retval; | ||
903 | smallint saved; | 903 | smallint saved; |
904 | }; | 904 | }; |
905 | void save_nofork_data(struct nofork_save_area *save) FAST_FUNC; | 905 | void save_nofork_data(struct nofork_save_area *save) FAST_FUNC; |
@@ -1010,7 +1010,7 @@ enum { | |||
1010 | extern const char *msg_eol; | 1010 | extern const char *msg_eol; |
1011 | extern smallint logmode; | 1011 | extern smallint logmode; |
1012 | extern int die_sleep; | 1012 | extern int die_sleep; |
1013 | extern int xfunc_error_retval; | 1013 | extern uint8_t xfunc_error_retval; |
1014 | extern jmp_buf die_jmp; | 1014 | extern jmp_buf die_jmp; |
1015 | extern void xfunc_die(void) NORETURN FAST_FUNC; | 1015 | extern void xfunc_die(void) NORETURN FAST_FUNC; |
1016 | extern void bb_show_usage(void) NORETURN FAST_FUNC; | 1016 | extern void bb_show_usage(void) NORETURN FAST_FUNC; |