diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-08 12:40:16 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-08 12:40:16 +0100 |
| commit | c2ada0e240f7c721ed09c9570b5375833c47370c (patch) | |
| tree | edf46fc67b3b6af1a10b2e5e223712fdc6dc77ea /fontconfig/src/fcatomic.c | |
| parent | 066de3c6d46ca099caba474b8e7d132ec772bc65 (diff) | |
| parent | 8a26872f0c9102cb357345eca24a4bf7401bbe70 (diff) | |
| download | vcxsrv-c2ada0e240f7c721ed09c9570b5375833c47370c.tar.gz vcxsrv-c2ada0e240f7c721ed09c9570b5375833c47370c.tar.bz2 vcxsrv-c2ada0e240f7c721ed09c9570b5375833c47370c.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa git update 8 jan 2013
Conflicts:
fontconfig/src/fccache.c
Diffstat (limited to 'fontconfig/src/fcatomic.c')
| -rwxr-xr-x | fontconfig/src/fcatomic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fontconfig/src/fcatomic.c b/fontconfig/src/fcatomic.c index 45048aa9f..c35a829fd 100755 --- a/fontconfig/src/fcatomic.c +++ b/fontconfig/src/fcatomic.c @@ -50,7 +50,6 @@ #include "fcint.h" #include <sys/types.h> #include <sys/stat.h> -#include <fcntl.h> #include <unistd.h> #include <stdlib.h> #include <time.h> @@ -109,7 +108,7 @@ FcAtomicLock (FcAtomic *atomic) strcpy ((char *) atomic->tmp, (char *) atomic->file); strcat ((char *) atomic->tmp, TMP_NAME); - fd = mkstemp ((char *) atomic->tmp); + fd = FcMakeTempfile ((char *) atomic->tmp); if (fd < 0) return FcFalse; f = fdopen (fd, "w"); |