diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-01 12:33:20 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-01 12:33:20 +0200 |
| commit | be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779 (patch) | |
| tree | 807b5640d1fedc88ddcda752f101ffdb3071092a /libXfont/src/fontfile/register.c | |
| parent | 11b60c4ebaf348b01051bfff19f947b073028a99 (diff) | |
| parent | 6dd755aa923291db2501cc5c22e409c41a70e3c1 (diff) | |
| download | vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.tar.gz vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.tar.bz2 vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Update following packages:
Conflicts:
X11/Xwinsock.h
apps/xhost/xhost.c
libXaw/src/Vendor.c
libXfont/include/X11/fonts/bdfint.h
libXfont/src/fontfile/catalogue.c
Diffstat (limited to 'libXfont/src/fontfile/register.c')
| -rw-r--r-- | libXfont/src/fontfile/register.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libXfont/src/fontfile/register.c b/libXfont/src/fontfile/register.c index 1a63cb331..4faeb8f0e 100644 --- a/libXfont/src/fontfile/register.c +++ b/libXfont/src/fontfile/register.c @@ -55,8 +55,10 @@ FontFileRegisterFpeFunctions(void) #ifdef XFONT_FREETYPE FreeTypeRegisterFontFileFunctions(); #endif - + FontFileRegisterLocalFpeFunctions (); +#ifdef HAVE_READLINK CatalogueRegisterLocalFpeFunctions (); +#endif } |