diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-07 12:17:07 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-07 12:17:07 +0100 |
| commit | 0e950715b62dcf30ffbf69831bf932fd348537e5 (patch) | |
| tree | 83fdafc455e9906f029e2e1ad926fb35c98e7be9 /fontconfig/src/fcdir.c | |
| parent | 506537495e6d808f219361a5b270510c752e7a2e (diff) | |
| parent | 3f553aaceddc9b09363c73d9bea40eaea8164fc4 (diff) | |
| download | vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.tar.gz vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.tar.bz2 vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git update 7 jan 2013
Conflicts:
fontconfig/src/fcatomic.c
pixman/pixman/pixman-mmx.c
pixman/pixman/pixman-sse2.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/wincursor.c
xorg-server/hw/xwin/winmsg.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winsetsp.c
xorg-server/hw/xwin/winwin32rootless.c
xorg-server/xfixes/cursor.c
Diffstat (limited to 'fontconfig/src/fcdir.c')
| -rw-r--r-- | fontconfig/src/fcdir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fontconfig/src/fcdir.c b/fontconfig/src/fcdir.c index 6869ea179..dc580bb6f 100644 --- a/fontconfig/src/fcdir.c +++ b/fontconfig/src/fcdir.c @@ -126,10 +126,10 @@ FcFileScanConfig (FcFontSet *set, FcBool FcFileScan (FcFontSet *set, FcStrSet *dirs, - FcFileCache *cache, /* XXX unused */ + FcFileCache *cache FC_UNUSED, FcBlanks *blanks, const FcChar8 *file, - FcBool force) + FcBool force FC_UNUSED) { return FcFileScanConfig (set, dirs, blanks, file, FcConfigGetCurrent ()); } @@ -316,7 +316,7 @@ FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config) } FcBool -FcDirSave (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir) +FcDirSave (FcFontSet *set FC_UNUSED, FcStrSet * dirs FC_UNUSED, const FcChar8 *dir FC_UNUSED) { return FcFalse; /* XXX deprecated */ } |