Ticket 37. x2str() replaced by formatTime() for changePolicyTimeout

[stg.git] / projects / sgconf / main.cpp

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index 81ea716c74055ff86007092e4163e4970361b04b..b107ee9515c1265e589ebfcd6924c8fc3ac77143 100644 (file)
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -369,7 +369,7 @@ if (cd == (iconv_t) -1)
     exit(ICONV_ERR_CODE);
     }
 
     exit(ICONV_ERR_CODE);
     }
 

-#if defined(FREE_BSD) || defined(FREE_BSD5)
+#if defined(CONST_ICONV)

 nconv = iconv (cd, (const char**)&inbuf, &insize, &outbuf, &outsize);
 #else
 nconv = iconv (cd, &inbuf, &insize, &outbuf, &outsize);
 nconv = iconv (cd, (const char**)&inbuf, &insize, &outbuf, &outsize);
 #else
 nconv = iconv (cd, &inbuf, &insize, &outbuf, &outsize);


@@ -1062,7 +1062,7 @@ while (1)
         case 707:
         case 708:
         case 709:
         case 707:
         case 708:
         case 709:

-            ParseAnyString(optarg, &str);
+            ParseAnyString(optarg, &str, "koi8-ru");

             //printf("UD%d\n", c - 700);
             req.ud[c - 700] = str;
             break;
             //printf("UD%d\n", c - 700);
             req.ud[c - 700] = str;
             break;