disable use of #pragma interface under Mac OS X

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

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 1d5a9f6323481726cbee6b8ade87a7cf0555e38f..6f041f7680d08136547ff9fd7f322da40374a738 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -38,8 +38,8 @@
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 

-// FreeBSD requires this, it probably doesn't hurt for others
-#ifdef __UNIX__
+// FreeBSD & Watcom require this, it probably doesn't hurt for others
+#if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)

     #include <sys/types.h>
 #endif
 
     #include <sys/types.h>
 #endif
 


@@ -132,7 +132,7 @@ wxString wxRegExImpl::GetErrorMsg(int errorcode) const
 
         (void)regerror(errorcode, &m_RegEx, (char *)buf.data(), len);
 
 
         (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);
 
 #else // !Unicode
         (void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len);