aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorMark Whitley <markw@lineo.com>2001-04-25 18:06:21 +0000
committerMark Whitley <markw@lineo.com>2001-04-25 18:06:21 +0000
commitc29c44c00e8f65d96bffa37a521b4d4be1f913ce (patch)
tree3621ec8b67d133606ac7f47c1afe3247383d2c94 /libbb
parent4f4bcfcd1a3b57317f601eeca5c61ed8916468f6 (diff)
downloadbusybox-c29c44c00e8f65d96bffa37a521b4d4be1f913ce.tar.gz
libbb.h now includes ../busybox.h. This way, files in libbb that have
BB_[FEATURE] #defines won't be ignored. Credit to Magnus Damm for spotting this.
Diffstat (limited to 'libbb')
-rw-r--r--libbb/libbb.h4
-rw-r--r--libbb/messages.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/libbb/libbb.h b/libbb/libbb.h
index cbc1436fc..2937b4863 100644
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -35,6 +35,10 @@
#include <features.h>
+#ifndef _BB_INTERNAL_H_
+#include "../busybox.h"
+#endif
+
#if __GNU_LIBRARY__ < 5
/* libc5 doesn't define socklen_t */
typedef unsigned int socklen_t;
diff --git a/libbb/messages.c b/libbb/messages.c
index 16ac63f69..bdf931ba6 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -19,7 +19,7 @@
*
*/
-#include "../busybox.h"
+#include "libbb.h"
#ifdef L_full_version
const char *full_version = BB_BANNER " multi-call binary";