diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-22 09:28:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-22 09:28:23 +0100 |
| commit | ecc59cb52ffe4a84fddae997bba64adad35d5e93 (patch) | |
| tree | 233c2cf0ea65dcf0b671f28e14b1fb083dac87e3 /fontconfig/fc-list/fc-list.c | |
| parent | d19dd4c9cf37b7b691552c4f4dd873471e31ca68 (diff) | |
| parent | 6baac61e6ca9cd314e689dfe7f84771aad08c66e (diff) | |
| download | vcxsrv-ecc59cb52ffe4a84fddae997bba64adad35d5e93.tar.gz vcxsrv-ecc59cb52ffe4a84fddae997bba64adad35d5e93.tar.bz2 vcxsrv-ecc59cb52ffe4a84fddae997bba64adad35d5e93.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'fontconfig/fc-list/fc-list.c')
| -rw-r--r-- | fontconfig/fc-list/fc-list.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fontconfig/fc-list/fc-list.c b/fontconfig/fc-list/fc-list.c index ad383328e..0149b0c53 100644 --- a/fontconfig/fc-list/fc-list.c +++ b/fontconfig/fc-list/fc-list.c @@ -94,16 +94,16 @@ usage (char *program, int error) int main (int argc, char **argv) { - int verbose = 0; - int quiet = 0; - FcChar8 *format = NULL; - int nfont = 0; - int i; - FcObjectSet *os = 0; - FcFontSet *fs; - FcPattern *pat; + int verbose = 0; + int quiet = 0; + const FcChar8 *format = NULL; + int nfont = 0; + int i; + FcObjectSet *os = 0; + FcFontSet *fs; + FcPattern *pat; #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; + int c; #if HAVE_GETOPT_LONG while ((c = getopt_long (argc, argv, "vf:qVh", longopts, NULL)) != -1) @@ -158,7 +158,7 @@ main (int argc, char **argv) if (!verbose && !format && !os) os = FcObjectSetBuild (FC_FAMILY, FC_STYLE, FC_FILE, (char *) 0); if (!format) - format = "%{=fclist}\n"; + format = (const FcChar8 *) "%{=fclist}\n"; fs = FcFontList (0, pat, os); if (os) FcObjectSetDestroy (os); |