diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-22 14:27:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-22 14:27:38 +0100 |
| commit | 7002c66cfba01e7d3b88dae498a195f78f0e83f5 (patch) | |
| tree | 2fbbd202a6a4243f0e64a8b22e22417a609ae19d /fontconfig/src/fcdefault.c | |
| parent | 50c07563e17397daf040a32d8fdd3ab397e72371 (diff) | |
| parent | 470f7ca9f0be348faf2f03fc16811844c5eeffce (diff) | |
| download | vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.tar.gz vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.tar.bz2 vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-config
Conflicts:
mesalib/src/mesa/main/syncobj.c
mesalib/src/mesa/main/syncobj.h
xorg-server/hw/xwin/winconfig.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
Diffstat (limited to 'fontconfig/src/fcdefault.c')
| -rw-r--r-- | fontconfig/src/fcdefault.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fontconfig/src/fcdefault.c b/fontconfig/src/fcdefault.c index b1bd9cc1f..d1217a4dc 100644 --- a/fontconfig/src/fcdefault.c +++ b/fontconfig/src/fcdefault.c @@ -148,11 +148,11 @@ retry: prgname = FcStrdup (""); #else char buf[PATH_MAX + 1]; - unsigned int len; + int len; char *p = NULL; len = readlink ("/proc/self/exe", buf, sizeof (buf) - 1); - if (len > 0) + if (len != -1) { buf[len] = '\0'; p = buf; |