aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/module/Makefile.am2
-rw-r--r--iconv-detect.c16
2 files changed, 10 insertions, 8 deletions
diff --git a/calendar/module/Makefile.am b/calendar/module/Makefile.am
index 49442cb955..59c6f8098d 100644
--- a/calendar/module/Makefile.am
+++ b/calendar/module/Makefile.am
@@ -77,3 +77,5 @@ libevolution_module_calendar_la_LIBADD = \
libevolution_module_calendar_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
+
+-include $(top_srcdir)/git.mk
diff --git a/iconv-detect.c b/iconv-detect.c
index 7cd6bde85e..908250c763 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;
CharInfo *info;
iconv_t cd;
FILE *fp;
- gint i;
+ int i;
fp = fopen ("iconv-detect.h", "w");
if (fp == NULL)