From c5124240c43bd7949275aac7eb9ee7e33bc24fa7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 7 Dec 2001 22:41:25 +0000 Subject: [PATCH] watcom fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/textbuf.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp index 5824b2014c..629976253e 100644 --- a/src/common/textbuf.cpp +++ b/src/common/textbuf.cpp @@ -43,7 +43,7 @@ // - Mac when compiling with CodeWarrior (__WXMAC__) const wxTextFileType wxTextBuffer::typeDefault = -#if defined(__WINDOWS__) +#if defined(__WINDOWS__) || defined(__DOS__) wxTextFileType_Dos; #elif defined(__UNIX__) wxTextFileType_Unix; @@ -251,7 +251,8 @@ wxTextFileType wxTextBuffer::GuessType() const : wxTextFileType_##t2 // 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 ) return GREATER_OF(Dos, Mac); else if ( nDos < nUnix ) -- 2.47.2