From 1c028ca33dc059a9d8f18daafcd77b5950268f41 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Fri, 8 Apr 2016 18:25:59 -0500 Subject: Redefining basename_r to mean something random seems popular (bionic and freebsd both did it) so use getbasename instead. --- lib/portability.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'lib/portability.h') 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 #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 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__ -- cgit v1.2.3