Update docs/tcp.txt

[oweals/busybox.git] / include / busybox.h

diff --git a/include/busybox.h b/include/busybox.h
index 48fc0b4c84a0e34297ca4781c59cb87397982b61..b1e31e5ee6350e5d039352f5c0a8ce2470831c1d 100644 (file)
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -1,38 +1,22 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Busybox main internal header file
- *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #ifndef BUSYBOX_H
 #define BUSYBOX_H 1
 
 #include "libbb.h"
+/* BB_DIR_foo and BB_SUID_bar constants: */
+#include "applet_metadata.h"
 
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-/* order matters: used as index into "install_dir[]" in appletlib.c */
-typedef enum bb_install_loc_t {
-       _BB_DIR_ROOT = 0,
-       _BB_DIR_BIN,
-       _BB_DIR_SBIN,
-       _BB_DIR_USR_BIN,
-       _BB_DIR_USR_SBIN
-} bb_install_loc_t;
-
-typedef enum bb_suid_t {
-       _BB_SUID_DROP = 0,
-       _BB_SUID_MAYBE,
-       _BB_SUID_REQUIRE
-} bb_suid_t;
-
-
 /* Defined in appletlib.c (by including generated applet_tables.h) */
 /* Keep in sync with applets/applet_tables.c! */
-extern const char applet_names[];
+extern const char applet_names[] ALIGN1;
 extern int (*const applet_main[])(int argc, char **argv);
 extern const uint16_t applet_nameofs[];
-extern const uint8_t applet_install_loc[];
+extern const uint8_t applet_install_loc[] ALIGN1;
 
 #if ENABLE_FEATURE_SUID || ENABLE_FEATURE_PREFER_APPLETS
 # define APPLET_NAME(i) (applet_names + (applet_nameofs[i] & 0x0fff))