* wxMemoryStreams updates

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 7dcd0e499f6ae16711580c18b1c4db29e769a417..a26fcb502c85272b670ff71af44aca16e46898be 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -195,6 +195,10 @@ typedef  _TUCHAR     wxUChar;
   #endif
  #elif defined(__GNUWIN32__) && !defined(__MINGW32__) // Cygwin (not Mingw32) doesn't have wcslen.h, needed in buffer.h
   #define wxUSE_WCHAR_T 0
+ #elif defined(__BORLANDC__) // WIN16 BC++
+  #define wxUSE_WCHAR_T 0
+ #elif defined(__WATCOMC__)
+  #define wxUSE_WCHAR_T 0
  #else
   // add additional compiler checks if this fails
   #define wxUSE_WCHAR_T 1
@@ -319,7 +323,9 @@ typedef unsigned char   wxUChar;
 #define  wxSetlocale setlocale
 
    // string.h functions
-#define  wxStricmp   strcasecmp
+// #define  wxStricmp   strcasecmp
+// wxStricmp is defined below!!
+
 // #define  wxStrtok    strtok_r // this needs a configure check
 
    // leave the rest to defaults below