assert is raised when using the thread sample (which works) so the test is

[wxWidgets.git] / src / common / regex.cpp

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 7b480f24c80e18a686e0a84bd3812c4c96f25b48..6f041f7680d08136547ff9fd7f322da40374a738 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -39,7 +39,7 @@
 #endif //WX_PRECOMP
 
 // FreeBSD & Watcom require this, it probably doesn't hurt for others
-#if defined(__UNIX__) || defined(__WATCOMC__)
+#if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)
     #include <sys/types.h>
 #endif
 
@@ -132,7 +132,7 @@ wxString wxRegExImpl::GetErrorMsg(int errorcode) const
 
         (void)regerror(errorcode, &m_RegEx, (char *)buf.data(), len);
 
-        msg = buf.data();
+        msg = wxString(buf.data(), wxConvLibc);
 #else // !Unicode
         (void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len);