small m_blinkedOut consistency corrections

[wxWidgets.git] / include / wx / wxchar.h

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 7537bd055dda72600abbaa45a08be34615f94c6d..df2130d45d4c53a3b47cd90b2abc2b815584e370 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -302,7 +302,7 @@ typedef  _TUCHAR     wxUChar;
 // include wchar.h to get wcslen() declaration used by wx/buffer.h
 #        include <wchar.h>
 
-#      elif defined(__FreeBSD__) || defined(__DARWIN__)
+#      elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__)
 
 // include stdlib.h for wchar_t, wcslen is provided in wxchar.cpp
 #        include <stdlib.h>
@@ -467,7 +467,9 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
 #    define  wxStrcoll   strcoll
 #    define  wxStrcpy    strcpy
 #    define  wxStrcspn   strcspn
+#if !defined(__MWERKS__) || !defined(__WXMAC__)
 #    define  wxStrdup    strdup
+#endif
 #    define  wxStrlen_   strlen // used in wxStrlen inline function
 #    define  wxStrncat   strncat
 #    define  wxStrncmp   strncmp