enable archive file in release version

diff --git a/pgadmin/frm/frmImport.cpp b/pgadmin/frm/frmImport.cpp
index afb321820f8a0353da10ee3473c5c261a71ad065..e37f5006806d5fbd0b76c1f00a0bad94abbef493 100755 (executable)
--- a/pgadmin/frm/frmImport.cpp
+++ b/pgadmin/frm/frmImport.cpp
@@ -440,11 +440,7 @@ void frmImport::Init()
     wzdColsSettingPage->SetPrev(wzdFileOptsPage);\r
 \r
     if (pgCSVFile::CanHandleArchive())\r
-#ifdef _DEBUG\r
         rdbSrcArchFile->Enable();\r
-#else\r
-        rdbSrcArchFile->Disable();\r
-#endif\r
     else\r
         rdbSrcArchFile->Disable();\r
 \r

diff --git a/pgadmin/include/utils/pgodbc.h b/pgadmin/include/utils/pgodbc.h
index eef29a36e29f82db361169cd784ce16e3a93988e..3de3b01def13c98e1cb431f5fe013026d440cf0e 100755 (executable)
--- a/pgadmin/include/utils/pgodbc.h
+++ b/pgadmin/include/utils/pgodbc.h
@@ -15,7 +15,6 @@
 #include <sql.h>\r
 #include <sqlext.h>\r
 #endif\r
-#include <mbstring.h>\r
 \r
 class pgODBC\r
 {\r
@@ -62,8 +61,8 @@ public:
     const SQLWCHAR* GetErrorMsg() { return m_oerrmsg; }\r
 \r
     static const SQLWCHAR* SQLTypeToName(int sqltype);\r
-    static const bool pgODBC::IsDateTimeType(int sqltype) { return sqltype==SQL_DATETIME || sqltype==SQL_TIMESTAMP; }\r
-    static const bool pgODBC::IsIntervalType(int sqltype) { return sqltype==SQL_INTERVAL; }\r
+    static const bool IsDateTimeType(int sqltype) { return sqltype==SQL_DATETIME || sqltype==SQL_TIMESTAMP; }\r
+    static const bool IsIntervalType(int sqltype) { return sqltype==SQL_INTERVAL; }\r
     static int NumericToWChar(SQL_NUMERIC_STRUCT numericval, SQLWCHAR *strbuff, size_t bufflen);\r
     static int IntervalToWChar(SQL_INTERVAL_STRUCT intvval, SQLWCHAR *strbuff, size_t bufflen);\r
     static int DatetimeToWChar(SQL_TIMESTAMP_STRUCT tsval, SQLWCHAR *strbuff, size_t bufflen);\r