From 3ae6add49c8bca4aeacc4a948655483c3510aae8 Mon Sep 17 00:00:00 2001
From: Abs62 <ottomann@yandex.ru>
Date: Tue, 19 Jul 2011 22:36:04 +0400
Subject: [PATCH] Adjust program code and project file to new libraries

---
 bgl_babylon.cc | 10 +++++-----
 goldendict.pro |  2 +-
 iconv.cc       |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bgl_babylon.cc b/bgl_babylon.cc
index 343dde34..fec429f0 100644
--- a/bgl_babylon.cc
+++ b/bgl_babylon.cc
@@ -649,13 +649,13 @@ void Babylon::convertToUtf8( std::string &s, unsigned int type )
 
   inbufbytes = s.size();
   outbufbytes = s.size() * 6;
-#ifdef _WIN32
-  const char *inbuf;
-  inbuf = s.data();
-#else
+//#ifdef _WIN32
+//  const char *inbuf;
+//  inbuf = s.data();
+//#else
   char *inbuf;
   inbuf = (char *)s.data();
-#endif
+//#endif
   outbuf = (char*)malloc( outbufbytes + 1 );
   memset( outbuf, '\0', outbufbytes + 1 );
   defbuf = outbuf;
diff --git a/goldendict.pro b/goldendict.pro
index 524496e4..30d99bd6 100644
--- a/goldendict.pro
+++ b/goldendict.pro
@@ -41,7 +41,7 @@ win32 {
     LIBS += -lvorbisfile \
         -lvorbis \
         -logg \
-        -lhunspell-1.2
+        -lhunspell-1.3.2
     RC_FILE = goldendict.rc
     INCLUDEPATH += winlibs/include
     LIBS += -Lwinlibs/lib
diff --git a/iconv.cc b/iconv.cc
index 90c70814..b57086f3 100644
--- a/iconv.cc
+++ b/iconv.cc
@@ -44,11 +44,11 @@ Iconv::Result Iconv::convert( void const * & inBuf, size_t  & inBytesLeft,
   throw( exIncorrectSeq, exOther )
 {
   size_t result = iconv( state,
-                         #ifdef __WIN32
-                         (char const **)&inBuf,
-                         #else
+//                         #ifdef __WIN32
+//                         (char const **)&inBuf,
+//                         #else
                          (char **)&inBuf,
-                         #endif
+//                         #endif
                                            &inBytesLeft,
                          (char **)&outBuf, &outBytesLeft );