svn commit: trunk/busybox/include
vapier at busybox.net
vapier at busybox.net
Sun Jan 8 11:15:35 UTC 2006
Author: vapier
Date: 2006-01-08 03:15:34 -0800 (Sun, 08 Jan 2006)
New Revision: 13161
Log:
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
Modified:
trunk/busybox/include/libbb.h
Changeset:
Modified: trunk/busybox/include/libbb.h
===================================================================
--- trunk/busybox/include/libbb.h 2006-01-08 11:09:43 UTC (rev 13160)
+++ trunk/busybox/include/libbb.h 2006-01-08 11:15:34 UTC (rev 13161)
@@ -355,7 +355,7 @@
#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;
More information about the busybox-cvs
mailing list