From: Mike Frysinger Date: Sun, 8 Jan 2006 11:15:34 +0000 (-0000) Subject: Tito writes: X-Git-Tag: 1_1_0~372 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e885d5300a2a087e552b5b4ed5d3602d49a3fde9;p=oweals%2Fbusybox.git Tito writes: Somehow while applying the bb_do_delay patch a change slipped in libbb.h that broke compilation. libbb.h Line 355 extern char bb_path_mtab_file[]; This conflicts with mtab_file.c #if defined(CONFIG_FEATURE_MTAB_SUPPORT) const char bb_path_mtab_file[] = "/etc/mtab"; #else const char bb_path_mtab_file[] = "/proc/mounts"; #endif --- diff --git a/include/libbb.h b/include/libbb.h index f6efc40df..e9a828c52 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -355,7 +355,7 @@ extern const char * const bb_default_login_shell; #define DEFAULT_SHELL_SHORT_NAME (bb_default_login_shell+6) -extern char bb_path_mtab_file[]; +extern const char bb_path_mtab_file[]; extern int bb_default_error_retval;