diff options
| -rw-r--r-- | include/libbb.h | 11 | ||||
| -rw-r--r-- | modutils/modutils-24.c | 1 |
2 files changed, 5 insertions, 7 deletions
diff --git a/include/libbb.h b/include/libbb.h index f60f4278b..d0c7ace22 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -32,6 +32,11 @@ #include <stdarg.h> #include <stddef.h> #include <string.h> +/* There are two incompatible basename's, let not use them! */ +/* See the dirname/basename man page for details */ +#include <libgen.h> /* dirname,basename */ +#undef basename +#define basename dont_use_basename #include <sys/poll.h> #include <sys/ioctl.h> #include <sys/mman.h> @@ -133,12 +138,6 @@ int vdprintf(int d, const char *format, va_list ap); #endif /* klogctl is in libc's klog.h, but we cheat and not #include that */ int klogctl(int type, char *b, int len); -/* This is declared here rather than #including <libgen.h> in order to avoid - * confusing the two versions of basename. See the dirname/basename man page - * for details. */ -#if !defined __FreeBSD__ -char *dirname(char *path); -#endif #ifndef PATH_MAX # define PATH_MAX 256 #endif diff --git a/modutils/modutils-24.c b/modutils/modutils-24.c index bbc54e316..12cb75c54 100644 --- a/modutils/modutils-24.c +++ b/modutils/modutils-24.c @@ -60,7 +60,6 @@ #include "libbb.h" #include "modutils.h" -#include <libgen.h> #include <sys/utsname.h> #if ENABLE_FEATURE_INSMOD_LOADINKMEM |