[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fcdir.c |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 79058f4e911487275323e93146e1e93ad15afcd8
Author: Masamichi Hosoda <trueroad at trueroad.jp>
Date:   Wed Jan 11 20:42:56 2017 +0900

    Bug 99360 - Fix cache file update on MinGW
    
    On Windows, opened or locked files cannot be removed.
    Since fontconfig locked an old cache file while updating the file,
    fontconfig failed to replace the file with updated file on Windows.
    
    This patch makes fontconfig does not lock the old cache file
    while updating it on Windows.

diff --git a/src/fcdir.c b/src/fcdir.c
index fd62a34..c8aaf54 100644
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -362,7 +362,9 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config)
     if (!dirs)
 	goto bail1;
 
+#ifndef _WIN32
     fd = FcDirCacheLock (dir, config);
+#endif
     /*
      * Scan the dir
      */
@@ -382,7 +384,9 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config)
     FcDirCacheWrite (cache, config);
 
  bail2:
+#ifndef _WIN32
     FcDirCacheUnlock (fd);
+#endif
     FcStrSetDestroy (dirs);
  bail1:
     FcFontSetDestroy (set);
@@ -417,7 +421,9 @@ FcDirCacheRescan (const FcChar8 *dir, FcConfig *config)
     if (!dirs)
 	goto bail;
 
+#ifndef _WIN32
     fd = FcDirCacheLock (dir, config);
+#endif
     /*
      * Scan the dir
      */
@@ -436,7 +442,9 @@ FcDirCacheRescan (const FcChar8 *dir, FcConfig *config)
     FcDirCacheWrite (new, config);
 
 bail1:
+#ifndef _WIN32
     FcDirCacheUnlock (fd);
+#endif
     FcStrSetDestroy (dirs);
 bail:
     if (d)