diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
| commit | 1678a69116d1c6ce900fe15f7813613bb28416dd (patch) | |
| tree | 9589536f6b4bd60b34f90cf5ed20240d40bbb38c /libXft/src/xftname.c | |
| parent | 9d911bc1246139019e555f443e934677a067bc0a (diff) | |
| parent | b2c925e360e2c366526de15b44603f855f94139c (diff) | |
| download | vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.gz vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.bz2 vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libfontenc/src/fontenc.c
Diffstat (limited to 'libXft/src/xftname.c')
| -rw-r--r-- | libXft/src/xftname.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libXft/src/xftname.c b/libXft/src/xftname.c index a0c6be704..30dd6e06c 100644 --- a/libXft/src/xftname.c +++ b/libXft/src/xftname.c @@ -33,7 +33,7 @@ static const FcObjectType _XftObjectTypes[] = { static FcBool _XftNameInitialized; -_X_HIDDEN void +_X_HIDDEN void _XftNameInit (void) { if (_XftNameInitialized) @@ -42,11 +42,11 @@ _XftNameInit (void) FcNameRegisterObjectTypes (_XftObjectTypes, NUM_OBJECT_TYPES); } -_X_EXPORT FcPattern +_X_EXPORT FcPattern *XftNameParse (const char *name) -{ +{ _XftNameInit (); - return FcNameParse ((FcChar8 *) name); + return FcNameParse ((FcChar8 *) name); } _X_EXPORT FcBool |