diff options
| author | Rob Landley <rob@landley.net> | 2016-04-08 18:25:59 -0500 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2016-04-08 18:25:59 -0500 |
| commit | 1c028ca33dc059a9d8f18daafcd77b5950268f41 (patch) | |
| tree | f1a6ac81fdecd28b72a864d20c5e65f18b302ee3 /lib/portability.h | |
| parent | 9b93dd397b4a00063073fdbd59b181a508470e70 (diff) | |
| download | toybox-1c028ca33dc059a9d8f18daafcd77b5950268f41.tar.gz | |
Redefining basename_r to mean something random seems popular (bionic and freebsd
both did it) so use getbasename instead.
Diffstat (limited to 'lib/portability.h')
| -rw-r--r-- | lib/portability.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/portability.h b/lib/portability.h index d11cc9c6..fdee5fcf 100644 --- a/lib/portability.h +++ b/lib/portability.h @@ -157,19 +157,11 @@ int utimensat(int fd, const char *path, const struct timespec times[2], int flag #endif // glibc in general -#if !defined(__GLIBC__) && !defined(__BIONIC__) +#if !defined(__GLIBC__) // POSIX basename. #include <libgen.h> #endif -// glibc was handled above; for 32-bit bionic we need to avoid a collision -// with toybox's basename_r so we can't include <libgen.h> even though that -// would give us a POSIX basename(3). -#if defined(__BIONIC__) -char *basename(char *path); -char *dirname(char *path); -#endif - // Work out how to do endianness #ifndef __APPLE__ |