diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
| commit | d6f64084b9bc07d0bdd527f9354f2d1d962ed16d (patch) | |
| tree | 81b2652d421992fd63143a04885e332e83e18d07 /fontconfig/src/fcatomic.c | |
| parent | 669b562a737c9418c53bfae69c0dbf1aabe318b4 (diff) | |
| parent | 7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb (diff) | |
| download | vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.gz vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.bz2 vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
fontconfig/src/fcint.h
fontconfig/src/fcstat.c
mesalib/src/mapi/glapi/gen/GL3x.xml
xorg-server/glx/glxext.h
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 96f01235f..557dbc970 100644 --- a/fontconfig/src/fcatomic.c +++ b/fontconfig/src/fcatomic.c @@ -100,12 +100,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); @@ -186,7 +187,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; |