Update to Xft version 2

This commit is contained in:
Keith Packard 2002-02-15 07:36:14 +00:00
parent ccb3e93b27
commit 65018b4a46
1 changed files with 4 additions and 3 deletions

View File

@ -47,7 +47,8 @@ extern int optind, opterr, optopt;
#endif #endif
#endif #endif
void usage (char *program) static void
usage (char *program)
{ {
fprintf (stderr, "usage: %s [-vV?] [--verbose] [--version] [--help] [dirs]\n", fprintf (stderr, "usage: %s [-vV?] [--verbose] [--version] [--help] [dirs]\n",
program); program);
@ -65,7 +66,7 @@ main (int argc, char **argv)
{ {
int ret = 0; int ret = 0;
FcFontSet *set; FcFontSet *set;
char **dirs; FcChar8 **dirs;
int verbose = 0; int verbose = 0;
int i; int i;
#if HAVE_GETOPT_LONG || HAVE_GETOPT #if HAVE_GETOPT_LONG || HAVE_GETOPT
@ -100,7 +101,7 @@ main (int argc, char **argv)
return 1; return 1;
} }
if (argv[i]) if (argv[i])
dirs = argv+i; dirs = (FcChar8 **) (argv+i);
else else
dirs = FcConfigGetDirs (0); dirs = FcConfigGetDirs (0);
/* /*