X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..ae80f83724464f0d178d85a60e1ba6e9a1c4ae8f:/include/wx/strconv.h?ds=sidebyside

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 97239009c4..fa3e22c42d 100644
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -20,6 +20,9 @@
 #include "wx/wxchar.h"
 #include "wx/buffer.h"
 
+#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
+#  undef __BSEXCPT__
+#endif
 #include <stdlib.h>
 
 #if wxUSE_WCHAR_T
@@ -149,7 +152,7 @@ WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
     #define wxMBFILES 0
 #endif
 
-#if wxMBFILES
+#if wxMBFILES && wxUSE_UNICODE
     #define wxFNCONV(name) wxConvFile.cWX2MB(name)
     #define wxFNSTRINGCAST wxMBSTRINGCAST
 #else