--- contrib/libgen/basename_r.c.orig	2014-09-30 16:50:26 UTC
+++ contrib/libgen/basename_r.c
@@ -26,7 +26,7 @@
    02111-1307 USA.  */
 
 char *
-basename_r (filename)
+compat_basename (filename)
      const char *filename;
 {
   char *p;
--- contrib/libgen/dirname_r.c.orig	2014-09-30 16:50:26 UTC
+++ contrib/libgen/dirname_r.c
@@ -184,7 +184,7 @@
    02111-1307 USA.  */
 
 char *
-dirname_r (char *path)
+compat_dirname (char *path)
 {
   static const char dot[] = ".";
   char *last_slash;
--- libglusterfs/src/compat.h.orig	2014-09-30 16:50:26 UTC
+++ libglusterfs/src/compat.h
@@ -406,13 +406,13 @@
 }
 
 #ifdef THREAD_UNSAFE_BASENAME
-char *basename_r(const char *);
-#define basename(path) basename_r(path)
+char *compat_basename(const char *);
+#define basename(path) compat_basename(path)
 #endif /* THREAD_UNSAFE_BASENAME */
 
 #ifdef THREAD_UNSAFE_DIRNAME
-char *dirname_r(char *path);
-#define dirname(path) dirname_r(path)
+char *compat_dirname(char *path);
+#define dirname(path) compat_dirname(path)
 #endif /* THREAD_UNSAFE_DIRNAME */
 
 int gf_mkostemp (char *tmpl, int suffixlen, int flags);