From 7f9d248a0ad8c092fe028cffc5a77704dd957173 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 2 Jun 2009 11:04:25 -0400 Subject: Use standard C types in iconv-detect.c --- iconv-detect.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/iconv-detect.c b/iconv-detect.c index 7cd6bde85e..4eb6597225 100644 --- a/iconv-detect.c +++ b/iconv-detect.c @@ -52,9 +52,9 @@ enum { typedef struct { - gchar *charset; - gchar *format; - gint id; + char *charset; + char *format; + int id; } CharInfo; @@ -67,7 +67,7 @@ static CharInfo iso8859_tests[] = { { "8859-1", "%d-%d", NO_ISO_D_DASH_D }, }; -static gint num_iso8859_tests = sizeof (iso8859_tests) / sizeof (CharInfo); +static int num_iso8859_tests = sizeof (iso8859_tests) / sizeof (CharInfo); static CharInfo iso2022_tests[] = { { "iso-2022-jp", "iso-%d-%s", ISO_DASH_D_DASH_S_LOWER }, @@ -75,7 +75,7 @@ static CharInfo iso2022_tests[] = { { "ISO2022-JP", "ISO%d-%s", ISO_D_DASH_S }, }; -static gint num_iso2022_tests = sizeof (iso2022_tests) / sizeof (CharInfo); +static int num_iso2022_tests = sizeof (iso2022_tests) / sizeof (CharInfo); static CharInfo iso10646_tests[] = { { "iso-10646-1", "iso-%d-%d", ISO_DASH_D_DASH_D_LOWER }, @@ -87,16 +87,16 @@ static CharInfo iso10646_tests[] = { { "UCS-4BE", "UCS-4BE", UCS4 }, }; -static gint num_iso10646_tests = sizeof (iso10646_tests) / sizeof (CharInfo); +static int num_iso10646_tests = sizeof (iso10646_tests) / sizeof (CharInfo); -gint main (gint argc, gchar **argv) +int main (int argc, char **argv) { - guint iso8859, iso2022, iso10646; + unsigned int iso8859, iso2022, iso10646; CharInfo *info; iconv_t cd; FILE *fp; - gint i; + int i; fp = fopen ("iconv-detect.h", "w"); if (fp == NULL) -- cgit v1.2.3