Author: mir3x
Date: Mon Jan 16 13:54:48 2017
New Revision: 34843
URL: http://svn.gna.org/viewcvs/freeciv?rev=34843&view=rev
Log:
Fix building without iconv
See bug #25430
Modified:
branches/S2_5/utility/fciconv.c
Modified: branches/S2_5/utility/fciconv.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/utility/fciconv.c?rev=34843&r1=34842&r2=34843&view=diff
==============================================================================
--- branches/S2_5/utility/fciconv.c (original)
+++ branches/S2_5/utility/fciconv.c Mon Jan 16 13:54:48 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
[email protected]
https://mail.gna.org/listinfo/freeciv-commits
