Author: mir3x Date: Mon Jan 16 13:54:28 2017 New Revision: 34842 URL: http://svn.gna.org/viewcvs/freeciv?rev=34842&view=rev Log: Fix building without iconv
See bug #25430 Modified: trunk/utility/fciconv.c Modified: trunk/utility/fciconv.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/utility/fciconv.c?rev=34842&r1=34841&r2=34842&view=diff ============================================================================== --- trunk/utility/fciconv.c (original) +++ trunk/utility/fciconv.c Mon Jan 16 13:54:28 2017 @@ -41,10 +41,10 @@ static bool is_init = FALSE; static char convert_buffer[4096]; +static const char *transliteration_string; #ifdef HAVE_ICONV static const char *local_encoding, *data_encoding, *internal_encoding; -static const char *transliteration_string; #else /* HAVE_ICONV */ /* Hack to confuse the compiler into working. */ # define local_encoding get_local_encoding() @@ -61,11 +61,10 @@ void init_character_encodings(const char *my_internal_encoding, bool my_use_transliteration) { + transliteration_string = ""; #ifdef HAVE_ICONV if (my_use_transliteration) { transliteration_string = "//TRANSLIT"; - } else { - transliteration_string = ""; } /* Set the data encoding - first check $FREECIV_DATA_ENCODING, _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits