diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
| commit | c67a0f76ca34e441a817a7cdf261f496f3b3f2d6 (patch) | |
| tree | c197b74a8c2f076aaa4f5506b90d6ad8e38b52b2 /mkfontscale/mkfontscale.c | |
| parent | 8d07c58314685d56a0586d0a437b541ea2b92a54 (diff) | |
| parent | 2a1abdc8fe640583dac90dc316caf2d40b9ee4e2 (diff) | |
| download | vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.gz vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.bz2 vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale xkeyboard-config git update 14 jan 2013
Conflicts:
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'mkfontscale/mkfontscale.c')
| -rw-r--r-- | mkfontscale/mkfontscale.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mkfontscale/mkfontscale.c b/mkfontscale/mkfontscale.c index f7aa709e1..01e982bf0 100644 --- a/mkfontscale/mkfontscale.c +++ b/mkfontscale/mkfontscale.c @@ -847,6 +847,7 @@ doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo) tprio = 0; } else #endif +#ifdef S_ISLNK { #ifndef WIN32 if (lstat(filename, &f_stat)) @@ -855,6 +856,9 @@ doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo) tprio = 0; #endif } +#else + ; +#endif if(doBitmaps) rc = bitmapIdentify(filename, &xlfd_name); else |