stop declariong our own dirname prototype

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/include/libbb.h b/include/libbb.h
index f60f4278bd65f243c1da4243805a2acc0b7b1451..d0c7ace225c6a9d4e337a46d38922fac9db016f0 100644 (file)
--- 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 bbc54e3169aa7c88a4f6f3e113de9aca74209478..12cb75c54c845915e398bfd0f0d8ddc04af6ec9c 100644 (file)
--- 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