emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stop declariong our own dirname prototype

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-09-10 13:48:34 +02:00
parent 522041ee7b
commit d48fdde370
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/libbb.h
View File

@ -32,6 +32,11 @@
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h> #include <stddef.h>
#include <string.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/poll.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/mman.h> #include <sys/mman.h>
@ -133,12 +138,6 @@ int vdprintf(int d, const char *format, va_list ap);
#endif #endif
/* klogctl is in libc's klog.h, but we cheat and not #include that */ /* klogctl is in libc's klog.h, but we cheat and not #include that */
int klogctl(int type, char *b, int len); 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 #ifndef PATH_MAX
# define PATH_MAX 256 # define PATH_MAX 256
#endif #endif

1
modutils/modutils-24.c
View File

@ -60,7 +60,6 @@
#include "libbb.h" #include "libbb.h"
#include "modutils.h" #include "modutils.h"
#include <libgen.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#if ENABLE_FEATURE_INSMOD_LOADINKMEM #if ENABLE_FEATURE_INSMOD_LOADINKMEM