diff options
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/configure.ac | 2 | ||||
| -rw-r--r-- | fontconfig/src/fccompat.c | 6 | ||||
| -rw-r--r-- | fontconfig/src/fcdefault.c | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac index e8ee55916..f8a41c934 100644 --- a/fontconfig/configure.ac +++ b/fontconfig/configure.ac @@ -141,7 +141,7 @@ AC_TYPE_PID_T # Checks for library functions. AC_FUNC_VPRINTF AC_FUNC_MMAP -AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s getopt getopt_long getprogname rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs lstat]) +AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs lstat]) dnl AC_CHECK_FUNCS doesn't check for header files. dnl posix_fadvise() may be not available in older libc. 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, '/'); |