diff options
| author | Mark Whitley | 2001-04-25 18:06:21 +0000 |
|---|---|---|
| committer | Mark Whitley | 2001-04-25 18:06:21 +0000 |
| commit | c29c44c00e8f65d96bffa37a521b4d4be1f913ce (patch) | |
| tree | 3621ec8b67d133606ac7f47c1afe3247383d2c94 | |
| parent | 4f4bcfcd1a3b57317f601eeca5c61ed8916468f6 (diff) | |
| download | busybox-c29c44c00e8f65d96bffa37a521b4d4be1f913ce.zip busybox-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.
| -rw-r--r-- | include/libbb.h | 4 | ||||
| -rw-r--r-- | libbb/libbb.h | 4 | ||||
| -rw-r--r-- | libbb/messages.c | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h index cbc1436..2937b48 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 cbc1436..2937b48 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 16ac63f..bdf931b 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"; |