watcom fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-12-07 22:41:25 +00:00
parent 625e74a703
commit c5124240c4

View File

@@ -43,7 +43,7 @@
// - Mac when compiling with CodeWarrior (__WXMAC__) // - Mac when compiling with CodeWarrior (__WXMAC__)
const wxTextFileType wxTextBuffer::typeDefault = const wxTextFileType wxTextBuffer::typeDefault =
#if defined(__WINDOWS__) #if defined(__WINDOWS__) || defined(__DOS__)
wxTextFileType_Dos; wxTextFileType_Dos;
#elif defined(__UNIX__) #elif defined(__UNIX__)
wxTextFileType_Unix; wxTextFileType_Unix;
@@ -251,7 +251,8 @@ wxTextFileType wxTextBuffer::GuessType() const
: wxTextFileType_##t2 : wxTextFileType_##t2
// Watcom C++ doesn't seem to be able to handle the macro // Watcom C++ doesn't seem to be able to handle the macro
#if !defined(__WATCOMC__) // VS: Watcom 11 doesn't have a problem...
#if !(defined(__WATCOMC__) && (__WATCOMC__ < 1100))
if ( nDos > nUnix ) if ( nDos > nUnix )
return GREATER_OF(Dos, Mac); return GREATER_OF(Dos, Mac);
else if ( nDos < nUnix ) else if ( nDos < nUnix )