2 files changed, 16 insertions, 7 deletions
diff --git a/libglusterfs/src/compat.c b/libglusterfs/src/compat.c
index 2dcd56a41..99a0041a5 100644
--- a/libglusterfs/src/compat.c
+++ b/libglusterfs/src/compat.c
@@ -550,3 +550,10 @@ strnlen(const char *string, size_t maxlen)
         return len;
 }
 #endif /* STRNLEN */
+
+#ifdef THREAD_UNSAFE_BASENAME
+#include "../../contrib/libgen/basename_r.c"
+#endif
+#ifdef THREAD_UNSAFE_DIRNAME
+#include "../../contrib/libgen/dirname_r.c"
+#endif
diff --git a/libglusterfs/src/compat.h b/libglusterfs/src/compat.h
index 24ceed22e..af890485d 100644
--- a/libglusterfs/src/compat.h
+++ b/libglusterfs/src/compat.h
@@ -107,13 +107,6 @@ enum {
 #define F_SETLK64       F_SETLK
 #define F_SETLKW64      F_SETLKW
 
-#ifdef __NetBSD__
-char *basename_r(const char *);
-char *dirname_r(char *);
-
-#define basename(path) basename_r(path)
-#define dirname(path) dirname_r(path)
-#endif /* __NetBSD__ */
 #endif /* GF_BSD_HOST_OS */
 
 #ifdef GF_DARWIN_HOST_OS
@@ -341,6 +334,15 @@ dirent_size (struct dirent *entry)
         return size;
 }
 
+#ifdef THREAD_UNSAFE_BASENAME
+char *basename_r(const char *);
+#define basename(path) basename_r(path)
+#endif /* THREAD_UNSAFE_BASENAME */
+
+#ifdef THREAD_UNSAFE_DIRNAME
+char *dirname_r(char *path);
+#define dirname(path) dirname_r(path)
+#endif /* THREAD_UNSAFE_DIRNAME */
 
 #ifdef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
 /* Linux, Solaris, Cygwin */