Miscellany

--- src/streams/mailinputstream.cpp     (revision 661104)
+++ src/streams/mailinputstream.cpp     (working copy)
@@ -71,16 +71,12 @@ decode(const string& enc, const string&
     string s;
     iconv_t const conv(iconv_open("UTF-8", enc.c_str()));
     if (conv == (iconv_t)-1) return s;
-#ifdef __linux__
-    char* in = (char*)data.c_str();
-#else
     const char* in = data.c_str();
-#endif
     size_t ilen = data.length();
     size_t olen = 4*ilen;
     char* out = (char*)malloc(olen);
     char* mem = out;
-    size_t r = iconv(conv, &in, &ilen, &out, &olen);
+    size_t r = iconv(conv, (char**) &in, &ilen, &out, &olen);
     if (r != (size_t)-1) {
         s.assign(mem, out-mem);
     }