aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-08-08 01:39:49 +0000
committerRob Landley <rob@landley.net>2006-08-08 01:39:49 +0000
commite3781b731215d826585fe37720eebe147705f340 (patch)
treeb146c666feca3c4908bc5bb90842a2c0d707385b /include
parent47b16a6fe98e1b18f269a2bd34471231553ebb94 (diff)
downloadbusybox-w32-e3781b731215d826585fe37720eebe147705f340.tar.gz
busybox-w32-e3781b731215d826585fe37720eebe147705f340.tar.bz2
busybox-w32-e3781b731215d826585fe37720eebe147705f340.zip
Add shared subtree support, suggested by Vladimir Dronnikov. Also break out a
few new (unfinished) config options, which I intend to make hidden (but enabled) when CONFIG_NITPICK is disabled. Getting the .config infrastructure to do that is non-obvious, it seems...
Diffstat (limited to 'include')
-rw-r--r--include/libbb.h2
-rw-r--r--include/platform.h29
2 files changed, 30 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 745f8372b..963a0290c 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -407,7 +407,7 @@ extern const char * const bb_default_login_shell;
407#define DEFAULT_SHELL_SHORT_NAME (bb_default_login_shell+6) 407#define DEFAULT_SHELL_SHORT_NAME (bb_default_login_shell+6)
408 408
409 409
410extern const char bb_path_mtab_file[]; 410extern char bb_path_mtab_file[];
411 411
412extern int bb_default_error_retval; 412extern int bb_default_error_retval;
413 413
diff --git a/include/platform.h b/include/platform.h
index 8890d4ffd..ca6f3634f 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -228,6 +228,35 @@ typedef unsigned long long int uintmax_t;
228 228
229#if defined(__linux__) 229#if defined(__linux__)
230#include <sys/mount.h> 230#include <sys/mount.h>
231// Make sure we have all the new mount flags we actually try to use.
232#ifndef MS_BIND
233#define MS_BIND (1<<12)
234#endif
235#ifndef MS_MOVE
236#define MS_MOVE (1<<13)
237#endif
238#ifndef MS_RECURSIVE
239#define MS_RECURSIVE (1<<14)
240#endif
241#ifndef MS_SILENT
242#define MS_SILENT (1<<15)
243#endif
244
245// The shared subtree stuff, which went in around 2.6.15
246#ifndef MS_UNBINDABLE
247#define MS_UNBINDABLE (1<<17)
248#endif
249#ifndef MS_PRIVATE
250#define MS_PRIVATE (1<<18)
251#endif
252#ifndef MS_SLAVE
253#define MS_SLAVE (1<<19)
254#endif
255#ifndef MS_SHARED
256#define MS_SHARED (1<<20)
257#endif
258
259
231#if !defined(BLKSSZGET) 260#if !defined(BLKSSZGET)
232#define BLKSSZGET _IO(0x12, 104) 261#define BLKSSZGET _IO(0x12, 104)
233#endif 262#endif