From: Mark Whitley <markw@lineo.com>
Date: Wed, 25 Apr 2001 18:06:21 +0000 (-0000)
Subject: libbb.h now includes ../busybox.h. This way, files in libbb that have
X-Git-Tag: android-x86-2.2~8759
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c29c44c00e8f65d96bffa37a521b4d4be1f913ce;p=android-x86%2Fexternal-busybox.git

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.
---

diff --git a/include/libbb.h b/include/libbb.h
index cbc1436fc..2937b4863 100644
--- a/include/libbb.h
+++ b/include/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/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";