Merge changes from CUPS 1.6svn-r9939.

[thirdparty/cups.git] / cups / testi18n.c

diff --git a/cups/testi18n.c b/cups/testi18n.c
index fa54919706f5abf851538e4917886e02e338e130..725c01b2b3e181bc516b0029934d35a2c6e59a6b 100644 (file)
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -3,7 +3,7 @@
  *
  *   Internationalization test for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -171,7 +171,7 @@ main(int  argc,                             /* I - Argument Count */
     for (i = 0, encoding = CUPS_AUTO_ENCODING;
          i < (int)(sizeof(lang_encodings) / sizeof(lang_encodings[0]));
         i ++)
-      if (!strcasecmp(lang_encodings[i], argv[2]))
+      if (!_cups_strcasecmp(lang_encodings[i], argv[2]))
       {
         encoding = (cups_encoding_t)i;
        break;
@@ -423,6 +423,7 @@ main(int  argc,                             /* I - Argument Count */
       puts("PASS");
   }
 
+#ifndef __linux
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strcpy(legsrc, legdest);
@@ -444,6 +445,7 @@ main(int  argc,                             /* I - Argument Count */
   }
   else
     puts("PASS");
+#endif /* !__linux */
 
  /*
   * Test UTF-8 to/from legacy charset (Windows 950)...