[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fccache.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 535e0a37d6d77a9d65096277f3bf94c39ffbf7d1
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Aug 31 12:39:38 2012 +0900

    Bug 54138 - X_OK permission is invalid for win32 access(..) calls
    
    X_OK checking was added back in 8ae1e3d5dc323542e7def06a42deea62c7ba7027
    which was removed due to the same reason in
    238489030a64fa883f8f9fc3d73247b7f7257899.
    apparently the test case in Bug#18934 still works without it.
    so I'm removing it again to get this working on Windows.

diff --git a/src/fccache.c b/src/fccache.c
index 9e582b9..81985df 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -853,7 +853,7 @@ FcDirCacheWrite (FcCache *cache, FcConfig *config)
     if (!list)
 	return FcFalse;
     while ((test_dir = FcStrListNext (list))) {
-	if (access ((char *) test_dir, W_OK|X_OK) == 0)
+	if (access ((char *) test_dir, W_OK) == 0)
 	{
 	    cache_dir = test_dir;
 	    break;
@@ -1368,7 +1368,7 @@ FcDirCacheCreateTagFile (const FcChar8 *cache_dir)
     if (!cache_dir)
 	return FcFalse;
 
-    if (access ((char *) cache_dir, W_OK|X_OK) == 0)
+    if (access ((char *) cache_dir, W_OK) == 0)
     {
 	/* Create CACHEDIR.TAG */
 	cache_tag = FcStrPlus (cache_dir, (const FcChar8 *) FC_DIR_SEPARATOR_S "CACHEDIR.TAG");