[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Akira TAGOH]

 configure.ac    |    2 +-
 src/fccompat.c  |    6 ------
 src/fcdefault.c |    5 ++++-
 3 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit fb3b410998aba8835999e2ca7003a180431cfaf4
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Jan 23 12:37:51 2013 +0900

    remove the unnecessary code

diff --git a/src/fccompat.c b/src/fccompat.c
index 0a9c135..a217160 100644
--- a/src/fccompat.c
+++ b/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;
commit 5400bb4fb43dc811b813f11d5b0c023db727f543
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Jan 23 12:32:37 2013 +0900

    Add another approach to FC_PRGNAME for Solaris 10 or before
    
    Patch from Raimund Steger

diff --git a/configure.ac b/configure.ac
index e8ee559..f8a41c9 100644
--- a/configure.ac
+++ b/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/src/fcdefault.c b/src/fcdefault.c
index d1217a4..d1b917f 100644
--- a/src/fcdefault.c
+++ b/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, '/');