summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEric Andersen2003-07-22 08:56:55 +0000
committerEric Andersen2003-07-22 08:56:55 +0000
commit85e5e72bc1acd9d58c11bde6e14c8270cd9f169f (patch)
tree9971c6951256dd0bba5ff2a7db08ed6f65ef218d /include
parent0a14c9f924eaf6a64e78959a190d187d646b3c0c (diff)
downloadbusybox-85e5e72bc1acd9d58c11bde6e14c8270cd9f169f.zip
busybox-85e5e72bc1acd9d58c11bde6e14c8270cd9f169f.tar.gz
Remove remaining libc5 support code
Diffstat (limited to 'include')
-rw-r--r--include/busybox.h17
-rw-r--r--include/libbb.h12
2 files changed, 6 insertions, 23 deletions
diff --git a/include/busybox.h b/include/busybox.h
index 8285494..aaa844f 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -31,6 +31,12 @@
#include <sys/stat.h>
#include <sys/types.h>
+#if __GNU_LIBRARY__ < 5
+#ifndef __dietlibc__
+#error "Sorry, libc5 is not supported"
+#endif
+#endif
+
#define BB_BANNER "BusyBox v" BB_VER " (" BB_BT ")"
#ifdef DMALLOC
@@ -93,17 +99,6 @@ extern const struct BB_applet applets[];
#endif
-/* Bit map related macros -- libc5 doens't provide these... sigh. */
-#ifndef setbit
-#ifndef NBBY
-#define NBBY CHAR_BIT
-#endif
-#define setbit(a,i) ((a)[(i)/NBBY] |= 1<<((i)%NBBY))
-#define clrbit(a,i) ((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-#define isset(a,i) ((a)[(i)/NBBY] & (1<<((i)%NBBY)))
-#define isclr(a,i) (((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-#endif
-
#ifndef RB_POWER_OFF
/* Stop system and switch power off if possible. */
#define RB_POWER_OFF 0x4321fedc
diff --git a/include/libbb.h b/include/libbb.h
index 6bd096c..a4d8c71 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -57,18 +57,6 @@
# define inline
#endif
-#if (__GNU_LIBRARY__ < 5) && (!defined __dietlibc__)
-/* libc5 doesn't define socklen_t */
-#ifndef _SOCKLEN_T
-#define _SOCKLEN_T
-typedef unsigned int socklen_t;
-#endif
-/* libc5 doesn't implement BSD 4.4 daemon() */
-extern int daemon (int nochdir, int noclose);
-/* libc5 doesn't implement strtok_r */
-char *strtok_r(char *s, const char *delim, char **ptrptr);
-#endif
-
/* Convenience macros to test the version of gcc. */
#if defined __GNUC__ && defined __GNUC_MINOR__
# define __GNUC_PREREQ(maj, min) \