use Unix line ending when compiling with Apple DevTools

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 8fd6ffaaaf8a28f732760c206d2cb32d9c591079..f90acd13fd2f7597ce79991d3d552afba6d75708 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -351,7 +351,7 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;

-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)

         m_mode = wxEOL_MAC;
 #else
         m_mode = wxEOL_UNIX;
         m_mode = wxEOL_MAC;
 #else
         m_mode = wxEOL_UNIX;


@@ -370,7 +370,7 @@ void wxTextOutputStream::SetMode(wxEOL mode)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;

-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)

         m_mode = wxEOL_MAC;
 #else
         m_mode = wxEOL_UNIX;
         m_mode = wxEOL_MAC;
 #else
         m_mode = wxEOL_UNIX;