diff options
author | marha <marha@users.sourceforge.net> | 2012-06-15 08:28:24 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-06-15 08:28:24 +0200 |
commit | 7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb (patch) | |
tree | 4b28c371be2077a3a6127cbc0694c80a84100699 /fontconfig/src/fcatomic.c | |
parent | 925b68a7b26823fdfa1cb25d3edc3545fc2175b1 (diff) | |
download | vcxsrv-7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb.tar.gz vcxsrv-7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb.tar.bz2 vcxsrv-7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb.zip |
fontconfig mesa pixman xserver git update 15 juni 2012
Diffstat (limited to 'fontconfig/src/fcatomic.c')
-rw-r--r-- | fontconfig/src/fcatomic.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fontconfig/src/fcatomic.c b/fontconfig/src/fcatomic.c index 4f6ab01f4..bc7b07bd4 100644 --- a/fontconfig/src/fcatomic.c +++ b/fontconfig/src/fcatomic.c @@ -99,12 +99,13 @@ FcAtomicCreate (const FcChar8 *file) FcBool FcAtomicLock (FcAtomic *atomic) { - int fd = -1; - FILE *f = 0; int ret; struct stat lck_stat; #ifdef HAVE_LINK + int fd = -1; + FILE *f = 0; + strcpy ((char *) atomic->tmp, (char *) atomic->file); strcat ((char *) atomic->tmp, TMP_NAME); fd = mkstemp ((char *) atomic->tmp); @@ -185,7 +186,7 @@ FcBool FcAtomicReplaceOrig (FcAtomic *atomic) { #ifdef _WIN32 - unlink (atomic->file); + unlink ((const char *) atomic->file); #endif if (rename ((char *) atomic->new, (char *) atomic->file) < 0) return FcFalse; |