summaryrefslogtreecommitdiff
path: root/fc-list/fc-list.c
diff options
context:
space:
mode:
authorMarc Aurele La France <tsi@ualberta.edu>2002-02-26 05:10:30 +0000
committerMarc Aurele La France <tsi@ualberta.edu>2002-02-26 05:10:30 +0000
commitc4bd0638c5f14329e71be8f170c30d376fc76972 (patch)
treea61d31ca30883501c99fa423af12b861f2858c33 /fc-list/fc-list.c
parentc5350655bef34cc08739bed324a482473b2a01b8 (diff)
Warning fixes
Diffstat (limited to 'fc-list/fc-list.c')
-rw-r--r--fc-list/fc-list.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c
index 1d2d67b..e33a81e 100644
--- a/fc-list/fc-list.c
+++ b/fc-list/fc-list.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: $
+ * $XFree86: xc/lib/fontconfig/fc-list/fc-list.c,v 1.2 2002/02/15 06:01:26 keithp Exp $
*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
@@ -29,10 +29,21 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#else
+#ifdef linux
+#define HAVE_GETOPT_LONG 1
+#endif
#define HAVE_GETOPT 1
#endif
+#ifndef HAVE_GETOPT
+#define HAVE_GETOPT 0
+#endif
+#ifndef HAVE_GETOPT_LONG
+#define HAVE_GETOPT_LONG 0
+#endif
+
#if HAVE_GETOPT_LONG
+#undef _GNU_SOURCE
#define _GNU_SOURCE
#include <getopt.h>
const struct option longopts[] = {
@@ -101,7 +112,7 @@ main (int argc, char **argv)
return 1;
}
if (argv[i])
- pat = FcNameParse (argv[i]);
+ pat = FcNameParse ((const FcChar8 *)argv[i]);
else
pat = FcPatternCreate ();