*** ./src/streamanalyzer/analysisresult.cpp.org	2009-10-27 14:39:23.000000000 +0900
--- ./src/streamanalyzer/analysisresult.cpp	2009-10-27 14:48:51.000000000 +0900
***************
*** 54,60 ****
--- 54,64 ----
      STRIGI_MUTEX_DEFINE(mutex);
  
      int32_t _fromLatin1(char*& out, const char* data, size_t len);
+ #ifdef	ORIGINAL_CODE
      Latin1Converter() :conv(iconv_open("UTF-8", "ISO-8859-1")), outlen(0) {
+ #else
+     Latin1Converter() :conv(iconv_open("UTF-8", "EUC-JP")), outlen(0) {
+ #endif
          STRIGI_MUTEX_INIT(&mutex);
      }
      ~Latin1Converter() {
*** ./src/streamanalyzer/lineeventanalyzer.cpp.org	2009-10-27 14:46:48.000000000 +0900
--- ./src/streamanalyzer/lineeventanalyzer.cpp	2009-10-27 14:50:38.000000000 +0900
***************
*** 78,83 ****
--- 78,87 ----
  }
  void
  LineEventAnalyzer::initEncoding(std::string enc) {
+ #ifndef	ORIGINAL_CODE
+     if (enc.size() == 0)
+ 	enc = "EUC-JP";
+ #endif
      if (enc.size() == 0 || enc == "UTF-8") {
          encoding.assign("UTF-8");
          if (converter != (iconv_t)-1) {
***************
*** 92,98 ****
--- 96,106 ----
          if (converter != (iconv_t)-1) {
              iconv_close(converter);
          }
+ #ifdef	ORIGIANL_CODE
          converter = iconv_open(encoding.c_str(), "UTF-8");
+ #else
+         converter = iconv_open("UTF-8", encoding.c_str());
+ #endif
      }
  }
  void
*** ./src/streams/inputstreamreader.cpp.org	2009-10-27 15:46:03.000000000 +0900
--- ./src/streams/inputstreamreader.cpp	2009-10-27 15:47:49.000000000 +0900
***************
*** 38,44 ****
--- 38,48 ----
      m_status = Ok;
      finishedDecoding = false;
      input = i;
+ #ifdef	ORIGINAL_CODE
      if (enc == 0) enc = "UTF-8";
+ #else
+     if (enc == 0) enc = "EUC-JP";
+ #endif
  #ifdef _LIBICONV_H
      if (sizeof(wchar_t) == 4) {
          converter = iconv_open("UCS-4-INTERNAL", enc);
