X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=70780eff968a6ec62c071da23229a4ebaac49fcc;hb=290077732ca206c99fe3d83697b38ff53af83361;hp=ba083fffe2f1a791dca465bd0c4a17b59b4cc63c;hpb=c13375ebe886fc3ed5ce70a260bb2b01cebb4b1f;p=pspp

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index ba083fffe2..70780eff96 100644
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -17,6 +17,7 @@
 #include <config.h>
 #include <xalloc.h>
 #include <assert.h>
+#include <locale.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -45,7 +46,7 @@ create_iconv (const char* tocode, const char* fromcode)
 
   /* I don't think it's safe to translate this string or to use messaging
      as the convertors have not yet been set up */
-  if ( (iconv_t) -1 == conv)
+  if ( (iconv_t) -1 == conv && 0 != strcmp (tocode, fromcode))
     {
       const int err = errno;
       fprintf (stderr,