aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-24 08:36:10 +0100
committermarha <marha@users.sourceforge.net>2013-01-24 08:36:10 +0100
commit06872e284da1c00ce03b234ca24aefeac64990d2 (patch)
treee1e8bee8a20f7b759b50edfc21d2313489280d10 /fontconfig/src
parent470f7ca9f0be348faf2f03fc16811844c5eeffce (diff)
downloadvcxsrv-06872e284da1c00ce03b234ca24aefeac64990d2.tar.gz
vcxsrv-06872e284da1c00ce03b234ca24aefeac64990d2.tar.bz2
vcxsrv-06872e284da1c00ce03b234ca24aefeac64990d2.zip
fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013
fontconfig: fb3b410998aba8835999e2ca7003a180431cfaf4 mesa: 5bd86b26df30d32412ca1b7ac02892ab5e10c6ef pixman: b527a0e615a726aa6a7d18f0ea0b38564b153afa xkbcomp: 705b9bbb426410f9510601c7010da51184919b36 xserver: 7fe5e6dfa5c1e71d8b7540b28c1d508687a2fbee
Diffstat (limited to 'fontconfig/src')
-rw-r--r--fontconfig/src/fccompat.c6
-rw-r--r--fontconfig/src/fcdefault.c5
2 files changed, 4 insertions, 7 deletions
diff --git a/fontconfig/src/fccompat.c b/fontconfig/src/fccompat.c
index 0a9c135fe..a2171607c 100644
--- a/fontconfig/src/fccompat.c
+++ b/fontconfig/src/fccompat.c
@@ -160,12 +160,6 @@ FcMakeTempfile (char *template)
if (_mktemp_s(template, strlen(template) + 1) != 0)
return -1;
fd = FcOpen(template, O_RDWR | O_EXCL | O_CREAT, 0600);
-#else
- /* warn at the runtime for just debugging purpose why something may
- * goes wrong. mingw may not have one, but it shouldn't be reached since
- * this function isn't used so far.
- */
- fprintf(stderr, "Fontconfig warning: No secure functions to create a temporary file\n");
#endif
return fd;
diff --git a/fontconfig/src/fcdefault.c b/fontconfig/src/fcdefault.c
index d1217a4dc..d1b917fd9 100644
--- a/fontconfig/src/fcdefault.c
+++ b/fontconfig/src/fcdefault.c
@@ -147,6 +147,9 @@ retry:
else
prgname = FcStrdup ("");
#else
+# if defined (HAVE_GETEXECNAME)
+ const char *p = getexecname ();
+# else
char buf[PATH_MAX + 1];
int len;
char *p = NULL;
@@ -157,7 +160,7 @@ retry:
buf[len] = '\0';
p = buf;
}
-
+# endif
if (p)
{
char *r = strrchr (p, '/');