aboutsummaryrefslogtreecommitdiff
path: root/include/libbb.h
diff options
context:
space:
mode:
authorvapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-01-08 11:15:34 +0000
committervapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-01-08 11:15:34 +0000
commitc59757db382d09ef5bda7734c7b9ac22da7c0fa4 (patch)
treec19caaa83303e2fe0934204fb2891e456b7663f4 /include/libbb.h
parent376cf8c4f05aba98dd98d82b8d5d1b6ca8a56b6a (diff)
downloadbusybox-w32-c59757db382d09ef5bda7734c7b9ac22da7c0fa4.tar.gz
busybox-w32-c59757db382d09ef5bda7734c7b9ac22da7c0fa4.tar.bz2
busybox-w32-c59757db382d09ef5bda7734c7b9ac22da7c0fa4.zip
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 git-svn-id: svn://busybox.net/trunk/busybox@13161 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'include/libbb.h')
-rw-r--r--include/libbb.h2
1 files changed, 1 insertions, 1 deletions
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;
355#define DEFAULT_SHELL_SHORT_NAME (bb_default_login_shell+6) 355#define DEFAULT_SHELL_SHORT_NAME (bb_default_login_shell+6)
356 356
357 357
358extern char bb_path_mtab_file[]; 358extern const char bb_path_mtab_file[];
359 359
360extern int bb_default_error_retval; 360extern int bb_default_error_retval;
361 361