[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fcatomic.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 841753a93f0e5698663b7931b8456e7b96259f54
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Aug 11 12:14:54 2014 +0900

    fallback to the another method to lock when link() failed
    
    Bug 82358 - FcAtomicLock fails on OS X on network mounts
    https://bugs.freedesktop.org/show_bug.cgi?id=82358

diff --git a/src/fcatomic.c b/src/fcatomic.c
index c1daed9..2ce419f 100644
--- a/src/fcatomic.c
+++ b/src/fcatomic.c
@@ -131,7 +131,7 @@ FcAtomicLock (FcAtomic *atomic)
 	return FcFalse;
     }
     ret = link ((char *) atomic->tmp, (char *) atomic->lck);
-    if (ret < 0 && errno == EPERM)
+    if (ret < 0 && (errno == EPERM || errno == ENOTSUP))
     {
 	/* the filesystem where atomic->lck points to may not supports
 	 * the hard link. so better try to fallback