added test for __MACH__ for Mac OS X compilation

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 6e6e875c5497e5b65c093aa5e9530b6b3d841b29..0ab57e3987d6cb696078c07341f477712bce5c77 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -366,7 +366,7 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
 #     define wxUChar unsigned char
 #   endif
 
 #     define wxUChar unsigned char
 #   endif
 

-#   ifdef __FreeBSD__
+#   if defined(__FreeBSD__) || defined(__MACH__)

 #     undef _T
 #   endif
 
 #     undef _T
 #   endif
 


@@ -419,7 +419,7 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
 #  elif defined(__SC__) || defined(__VISUALC__) || (defined(__MWERKS__) && defined(__INTEL__))
 #    define wxStricmp _stricmp
 #    define wxStrnicmp _strnicmp
 #  elif defined(__SC__) || defined(__VISUALC__) || (defined(__MWERKS__) && defined(__INTEL__))
 #    define wxStricmp _stricmp
 #    define wxStrnicmp _strnicmp

-#  elif defined(__UNIX__) || defined(__GNUWIN32__)
+#  elif defined(__UNIX__) || defined(__GNUWIN32__) || defined(__MACH__)

 #    define wxStricmp strcasecmp
 #    define wxStrnicmp strncasecmp
 #  elif defined(__MWERKS__) && !defined(__INTEL__)
 #    define wxStricmp strcasecmp
 #    define wxStrnicmp strncasecmp
 #  elif defined(__MWERKS__) && !defined(__INTEL__)