diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-24 08:40:35 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-24 08:40:35 +0100 |
| commit | 3e3af07f7697e9d23dd62fcf8f3a055602ae3341 (patch) | |
| tree | 9ad4b80b0c4df6e2dae13cde8d248a72273f9aae /fontconfig/src/fcdefault.c | |
| parent | 7002c66cfba01e7d3b88dae498a195f78f0e83f5 (diff) | |
| parent | 06872e284da1c00ce03b234ca24aefeac64990d2 (diff) | |
| download | vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.gz vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.bz2 vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013
Conflicts:
mesalib/src/glsl/.gitignore
Diffstat (limited to 'fontconfig/src/fcdefault.c')
| -rw-r--r-- | fontconfig/src/fcdefault.c | 5 |
1 files changed, 4 insertions, 1 deletions
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, '/'); |