Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
stop declariong our own dirname prototype
Browse files Browse the repository at this point in the history
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
  • Loading branch information
Denys Vlasenko committed Sep 10, 2011
1 parent 522041e commit d48fdde
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
11 changes: 5 additions & 6 deletions include/libbb.h
Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion modutils/modutils-24.c
Expand Up @@ -60,7 +60,6 @@

#include "libbb.h"
#include "modutils.h"
#include <libgen.h>
#include <sys/utsname.h>

#if ENABLE_FEATURE_INSMOD_LOADINKMEM
Expand Down

0 comments on commit d48fdde

Please sign in to comment.