On Windows, unlink before rename. Reported by Tim Evans.

diff --git a/ChangeLog b/ChangeLog
index 4db51b3eb836c8869b67bb893436a44b1ba5c0f8..3d8e30ccf6dc677415fb05756e186e3ec61aeb39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-22  Patrick Lam  <plam@mit.edu>
+       * src/fcatomic.c:
+
+       On Windows, unlink before rename.  Reported by Tim Evans.
+
 2006-03-15  Patrick Lam  <plam@mit.edu>
        * fc-lang/ab.orth:
        * fc-lang/ibo.orth:

diff --git a/src/fcatomic.c b/src/fcatomic.c
index a8487f33ff32fdc58e77b416044c3831c41c9d1c..a8b30f88c5f8aa5c62b0237703339345454e9ab5 100644 (file)
--- a/src/fcatomic.c
+++ b/src/fcatomic.c
@@ -177,6 +177,9 @@ FcAtomicOrigFile (FcAtomic *atomic)
 FcBool
 FcAtomicReplaceOrig (FcAtomic *atomic)
 {
+#ifdef _WIN32
+    unlink (atomic->file);
+#endif
     if (rename ((char *) atomic->new, (char *) atomic->file) < 0)
        return FcFalse;
     return FcTrue;