Update internal.h to conditionally include asm/string.h

[oweals/busybox.git] / internal.h

diff --git a/internal.h b/internal.h
index 9c55f5a49839220bbf17d386314cb2db867149a6..697ce4778e7bfe36e1f724124d680e83501afdb0 100644 (file)
--- a/internal.h
+++ b/internal.h
@@ -33,6 +33,9 @@
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <mntent.h>
+#if ! defined(__GLIBC__)
+#include <asm/string.h>
+#endif
 
 
 /* Some useful definitions */
@@ -98,6 +101,7 @@ struct BB_applet {
 /* From busybox.c */
 extern const struct BB_applet applets[];
 
+extern int ar_main(int argc, char **argv);
 extern int basename_main(int argc, char **argv);
 extern int busybox_main(int argc, char** argv);
 extern int block_device_main(int argc, char** argv);
@@ -148,6 +152,7 @@ extern int ls_main(int argc, char** argv);
 extern int lsmod_main(int argc, char** argv);
 extern int makedevs_main(int argc, char** argv);
 extern int math_main(int argc, char** argv);
+extern int md5sum_main(int argc, char** argv);
 extern int mkdir_main(int argc, char** argv);
 extern int mkfifo_main(int argc, char **argv);
 extern int mkfs_minix_main(int argc, char **argv);
@@ -188,6 +193,8 @@ extern int true_main(int argc, char** argv);
 extern int tput_main(int argc, char** argv);
 extern int tryopen_main(int argc, char** argv);
 extern int tty_main(int argc, char** argv);
+extern int uuencode_main(int argc, char** argv);
+extern int uudecode_main(int argc, char** argv);
 extern int umount_main(int argc, char** argv);
 extern int uname_main(int argc, char** argv);
 extern int uptime_main(int argc, char** argv);
@@ -284,20 +291,8 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags,
        char **extra_opts, char **mount_opts, int running_bg);
 #endif
 
-#if defined (BB_FSCK_MINIX) || defined (BB_MKFS_MINIX)
-/* Bit map related macros.  */
-#ifndef setbit
-#define CHAR_BITS      8 /* Number of bits in a `char'.  */
-#define setbit(a,i)     ((a)[(i)/CHAR_BITS] |= 1<<((i)%CHAR_BITS))
-#define clrbit(a,i)     ((a)[(i)/CHAR_BITS] &= ~(1<<((i)%CHAR_BITS)))
-#define isset(a,i)      ((a)[(i)/CHAR_BITS] & (1<<((i)%CHAR_BITS)))
-#define isclr(a,i)      (((a)[(i)/CHAR_BITS] & (1<<((i)%CHAR_BITS))) == 0)
-#endif
-#endif
-
-
 #ifndef RB_POWER_OFF
-/* Stop system and switch power off if possable.  */
+/* Stop system and switch power off if possible.  */
 #define RB_POWER_OFF   0x4321fedc
 #endif