*** empty log message ***

Utils/socket_stream.h

@@ -272,7 +272,7 @@ int basic_socketbuf<charT, traitsT>::readSocket()
   if(!inBuffer_.capacity())
     growInBuffer();
 
-#ifdef ARABICA_VS6_WORKAROUND
+#ifndef ARABICA_VS6_WORKAROUND
   size_t pbCount = std::min<int>(gptr() - eback(), pbSize_);
 #else
   size_t pbCount = min(gptr() - eback(), pbSize_);

Utils/utf16leucs2codecvt.h

@@ -11,17 +11,17 @@
 #ifndef ARABICA_NO_WCHAR_T
 #include <locale>
 
-namespace Arabica
-{
-namespace convert
-{
-
-#if(_MSC_VER < 1300)
+#ifdef ARABICA_VS6_WORKAROUND
 namespace std {
   typedef ::mbstate_t mbstate_t;
 }
 #endif
 
+namespace Arabica
+{
+namespace convert
+{
+
 class utf16leucs2codecvt : public std::codecvt<wchar_t, char, std::mbstate_t>
 {
 protected:

Utils/utf16utf8codecvt.cpp

@@ -2,6 +2,7 @@
 // $Id$
 //---------------------------------------------------------------------------
 #include "utf16utf8codecvt.h"
+#ifndef ARABICA_NO_WCHAR_T
 #include "impl/ucs2_utf8.h"
 //---------------------------------------------------------------------------
 // This facet converts from wide chars to char using the
@@ -61,5 +62,6 @@ int utf16utf8codecvt::do_length(const std::mbstate_t&,
   return (from_next-from);
 } // do_length
 
+#endif // ARABICA_NO_WCHAR_T
 // end of file
 

Utils/utf16utf8codecvt.h

@@ -12,9 +12,11 @@
 //
 // $Id$
 //---------------------------------------------------------------------------
+#include <SAX/ArabicaConfig.h>
+
+#ifndef ARABICA_NO_WCHAR_T
 #include <locale>
 
-#include <SAX/ArabicaConfig.h>
 namespace Arabica
 {
 namespace convert
@@ -70,5 +72,8 @@ protected:
 
 } // namespace convert
 } // namespace Arabica
+
+#endif // ARABICA_NO_WCHAR_T
+
 #endif