--- libs/locale/src/encoding/iconv_codepage.ipp.orig	2017-09-02 09:56:14 UTC

+++ libs/locale/src/encoding/iconv_codepage.ipp

@@ -43,7 +43,7 @@ class iconverter_base { (public)

     bool open(char const *to,char const *from,method_type how)

     {

         close();

-        cvt_ = iconv_open(to,from);

+        cvt_ = call_iconv_open(to,from);

         how_ = how;

         return cvt_ != (iconv_t)(-1);

     }

--- libs/locale/src/posix/codecvt.cpp.orig	2017-09-02 09:56:14 UTC

+++ libs/locale/src/posix/codecvt.cpp

@@ -38,7 +38,7 @@ namespace impl_posix {

             iconv_t d = (iconv_t)(-1);

             std::vector<uint32_t> first_byte_table;

             try {

-                d = iconv_open(utf32_encoding(),encoding.c_str());

+                d = call_iconv_open(utf32_encoding(),encoding.c_str());

                 if(d == (iconv_t)(-1)) {

                     throw std::runtime_error("Unsupported encoding" + encoding);

                 }

@@ -186,7 +186,7 @@ namespace impl_posix {

         {

             if(d!=(iconv_t)(-1))

                 return;

-            d=iconv_open(to,from);

+            d=call_iconv_open(to,from);

         }

         static char const *utf32_encoding()

--- libs/locale/src/util/iconv.hpp.orig	2017-09-02 09:56:14 UTC

+++ libs/locale/src/util/iconv.hpp

@@ -12,27 +12,7 @@

 namespace boost {

     namespace locale {

-#if defined(__ICONV_F_HIDE_INVALID) && defined(__FreeBSD__)

         extern "C" {

-            typedef size_t (*const_iconv_ptr_type)(iconv_t d,char const **in,size_t *insize,char **out,size_t *outsize,uint32_t,size_t *);

-            typedef size_t (*nonconst_iconv_ptr_type)(iconv_t d,char **in,size_t *insize,char **out,size_t *outsize,uint32_t,size_t *);

-        }

-        inline size_t do_iconv(const_iconv_ptr_type ptr,iconv_t d,char **in,size_t *insize,char **out,size_t *outsize)

-        {

-            char const **rin = const_cast<char const **>(in);

-            return ptr(d,rin,insize,out,outsize,__ICONV_F_HIDE_INVALID,0);

-        }

-        inline size_t do_iconv(nonconst_iconv_ptr_type ptr,iconv_t d,char **in,size_t *insize,char **out,size_t *outsize)

-        {

-            return ptr(d,in,insize,out,outsize,__ICONV_F_HIDE_INVALID,0);

-        }

-        inline size_t call_iconv(iconv_t d,char **in,size_t *insize,char **out,size_t *outsize)

-        {

-            char const **rin = const_cast<char const **>(in);

-            return do_iconv(__iconv, d, in,insize,out,outsize);

-        }

-#else

-        extern "C" {

             typedef size_t (*gnu_iconv_ptr_type)(iconv_t d,char const **in,size_t *insize,char **out,size_t *outsize);

             typedef size_t (*posix_iconv_ptr_type)(iconv_t d,char **in,size_t *insize,char **out,size_t *outsize);

         }

@@ -49,8 +29,17 @@ namespace boost {

         {

             return do_iconv( iconv, d, in,insize,out,outsize);

         }

+        inline iconv_t call_iconv_open(char const *to,char const *from)

+        {

+            iconv_t d = iconv_open(to,from);

+#if defined(ICONV_SET_ILSEQ_INVALID) && defined(__FreeBSD__)

+            if(d != (iconv_t)(-1)) {

+                int ilseq_invalid = 1;

+                iconvctl(d,ICONV_SET_ILSEQ_INVALID,&ilseq_invalid);

+            }

 #endif

-

+            return d;

+        }

     } // locale 

 } // boost