diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-25 09:22:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-25 09:22:25 +0200 |
| commit | 5b4c4c77b012ceac7b0f4d3ef2f33d91f01084d0 (patch) | |
| tree | c532fb2a693321cc9960fd554654e60351d63249 /fontconfig/test/test-migration.c | |
| parent | 42cd4a1fab6d183e218bd8c6bd65f65211af4d7c (diff) | |
| parent | 270d3a1aa4137dc15d7b7e5a0958cc8c0bef9a1a (diff) | |
| download | vcxsrv-5b4c4c77b012ceac7b0f4d3ef2f33d91f01084d0.tar.gz vcxsrv-5b4c4c77b012ceac7b0f4d3ef2f33d91f01084d0.tar.bz2 vcxsrv-5b4c4c77b012ceac7b0f4d3ef2f33d91f01084d0.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa git update 25 oct 2013
Conflicts:
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
Diffstat (limited to 'fontconfig/test/test-migration.c')
| -rw-r--r-- | fontconfig/test/test-migration.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/fontconfig/test/test-migration.c b/fontconfig/test/test-migration.c index 970965186..f127e276e 100644 --- a/fontconfig/test/test-migration.c +++ b/fontconfig/test/test-migration.c @@ -11,6 +11,19 @@ #endif #include <fontconfig/fontconfig.h> +#ifdef HAVE_MKDTEMP +#define fc_mkdtemp mkdtemp +#else +char * +fc_mkdtemp (char *template) +{ + if (!mktemp (template) || mkdir (template, 0700)) + return NULL; + + return template; +} +#endif + FcBool mkdir_p(const char *dir) { @@ -107,7 +120,7 @@ int main(void) { char template[32] = "fontconfig-XXXXXXXX"; - char *tmp = mkdtemp (template); + char *tmp = fc_mkdtemp (template); size_t len = strlen (tmp), xlen, dlen; char xdg[256], confd[256], fn[256], nfn[256], ud[256], nud[256]; int ret = -1; |