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 cbc1436fce7055953d3daae457dde1aaac1a13d2..2937b486324302eff5b92b59056c69a1ff05b5f8 100644 (file)
--- 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 cbc1436fce7055953d3daae457dde1aaac1a13d2..2937b486324302eff5b92b59056c69a1ff05b5f8 100644 (file)
--- 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 16ac63f6920f983d5a355d30bca616d93b69ec9f..bdf931ba650e45a6b23f419b155810f7f752e7b7 100644 (file)
--- 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";