From d5689d38b47bb5e148c6d97be144241440b634f8 Mon Sep 17 00:00:00 2001 From: Paul Giblock Date: Mon, 26 Jan 2009 04:47:08 +0000 Subject: [PATCH] Avoid compiletime errors from unrtf git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1970 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 5 +++++ plugins/flp_import/unrtf/convert.c | 2 +- plugins/flp_import/unrtf/html.c | 2 +- plugins/flp_import/unrtf/output.h | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87c75909e..310c61969 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,11 @@ * src/gui/widgets/knob.cpp: Fix infinite recursion on Mac OSX + * plugins/flp_import/unrtf/html.c: + * plugins/flp_import/unrtf/output.h: + * plugins/flp_import/unrtf/convert.c: + Avoid compile warnings + 2009-01-03 Paul Giblock * src/gui/widgets/automatable_button.cpp: diff --git a/plugins/flp_import/unrtf/convert.c b/plugins/flp_import/unrtf/convert.c index 87892a3cf..03b8165e0 100644 --- a/plugins/flp_import/unrtf/convert.c +++ b/plugins/flp_import/unrtf/convert.c @@ -2399,7 +2399,7 @@ static int cmd_ansi (Word *w, int align, char has_param, int param) { *=======================================================================*/ static int cmd_ansicpg (Word *w, int align, char has_param, int param) { - int i; + unsigned int i; for (i = 0; i < sizeof(codepages) / sizeof(CodepageInfo); i ++) { charset_codepage = &codepages[i]; if (charset_codepage->cp == param) { diff --git a/plugins/flp_import/unrtf/html.c b/plugins/flp_import/unrtf/html.c index 69661dba5..752c588fc 100644 --- a/plugins/flp_import/unrtf/html.c +++ b/plugins/flp_import/unrtf/html.c @@ -877,7 +877,7 @@ static const char* cp850 [] = { /* 0xff */ " ", }; #if 1 /* daved - 0.20.3 */ -static char * Greek[] = +static const char * Greek[] = { /* 0x80 */ "ç", /* 0x81 */ "ü", diff --git a/plugins/flp_import/unrtf/output.h b/plugins/flp_import/unrtf/output.h index 1ea6b4e1a..10ef2a3bf 100644 --- a/plugins/flp_import/unrtf/output.h +++ b/plugins/flp_import/unrtf/output.h @@ -285,7 +285,7 @@ typedef struct { #if 1 /* daved 0.20.3 GREEK font support */ short greek_first_char; short greek_last_char; - char **greek_translation_table; + const char **greek_translation_table; #endif char *(*unisymbol_print) (unsigned short);