summaryrefslogtreecommitdiff
path: root/filesystems/glusterfs/patches/patch-bf
diff options
context:
space:
mode:
Diffstat (limited to 'filesystems/glusterfs/patches/patch-bf')
-rw-r--r--filesystems/glusterfs/patches/patch-bf11
1 files changed, 7 insertions, 4 deletions
diff --git a/filesystems/glusterfs/patches/patch-bf b/filesystems/glusterfs/patches/patch-bf
index 62cfab0c738..c650fa879e9 100644
--- a/filesystems/glusterfs/patches/patch-bf
+++ b/filesystems/glusterfs/patches/patch-bf
@@ -1,11 +1,11 @@
-$NetBSD: patch-bf,v 1.1.1.1 2010/08/26 14:26:19 manu Exp $
+$NetBSD: patch-bf,v 1.2 2011/04/18 16:19:48 manu Exp $
basename() and dirname() are not supposed to be thread-safe, and NetBSD's
implementation is not. glusterfs assume the functions are thread-safe.
Borrow basename() and rdirname() form glibc and make NetBSD use them.
---- libglusterfs/src/compat.h.orig 2010-08-25 10:18:27.000000000 +0200
-+++ libglusterfs/src/compat.h 2010-08-25 10:23:19.000000000 +0200
+--- libglusterfs/src/compat.h.orig 2011-04-09 10:09:02.000000000 +0200
++++ libglusterfs/src/compat.h 2011-04-14 15:27:54.000000000 +0200
@@ -57,9 +57,9 @@
#endif /* HAVE_LLISTXATTR */
#endif /* GF_LINUX_HOST_OS */
@@ -17,12 +17,15 @@ Borrow basename() and rdirname() form glibc and make NetBSD use them.
#define UNIX_PATH_MAX 104
#include <sys/types.h>
-@@ -110,8 +110,12 @@
+@@ -110,8 +110,15 @@
#define F_GETLK64 F_GETLK
#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__ */