From fce7015fb4c72e0b943c8366041df5288115d0f2 Mon Sep 17 00:00:00 2001
From: "mscott%netscape.com" <mscott%netscape.com>
Date: Tue, 22 Jun 1999 18:55:32 +0000
Subject: [PATCH] Use MSG_LINEBREAK instead of LINEBREAK.

---
 mailnews/base/search/src/nsMsgFilterList.cpp |  4 ++--
 mailnews/news/src/nsNNTPHost.cpp             | 14 +++++++-------
 mailnews/news/src/nsNewsFolder.cpp           |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mailnews/base/search/src/nsMsgFilterList.cpp b/mailnews/base/search/src/nsMsgFilterList.cpp
index 0d1f29ac38bb..b94d8444bbe0 100644
--- a/mailnews/base/search/src/nsMsgFilterList.cpp
+++ b/mailnews/base/search/src/nsMsgFilterList.cpp
@@ -539,7 +539,7 @@ nsresult nsMsgFilterList::WriteIntAttr(nsMsgFilterFileAttrib attrib, int value)
 		*m_fileStream << attribStr;
 		*m_fileStream << "=\"";
 		*m_fileStream << value;
-		*m_fileStream << "\"" LINEBREAK;
+		*m_fileStream << "\"" MSG_LINEBREAK;
 	}
 //		XP_FilePrintf(fid, "%s=\"%d\"%s", attribStr, value, LINEBREAK);
 	return NS_OK;
@@ -560,7 +560,7 @@ nsresult nsMsgFilterList::WriteStrAttr(nsMsgFilterFileAttrib attrib, nsString2 &
 			*m_fileStream << attribStr;
 			*m_fileStream << "=\"";
 			*m_fileStream << ((escapedStr) ? escapedStr : str);
-			*m_fileStream << "\"" LINEBREAK;
+			*m_fileStream << "\"" MSG_LINEBREAK;
 //			XP_FilePrintf(fid, "%s=\"%s\"%s", attribStr, (escapedStr) ? escapedStr : str, LINEBREAK);
 		}
 		PR_FREEIF(escapedStr);
diff --git a/mailnews/news/src/nsNNTPHost.cpp b/mailnews/news/src/nsNNTPHost.cpp
index 218b2009a2f5..72ae7fccc77b 100644
--- a/mailnews/news/src/nsNNTPHost.cpp
+++ b/mailnews/news/src/nsNNTPHost.cpp
@@ -252,20 +252,20 @@ msg_convert_and_send_buffer(char* buf, PRUint32 length, PRBool convert_newlines_
   if (!convert_newlines_p)
 	{
 	}
-#if (LINEBREAK_LEN == 1)
+#if (MSG_LINEBREAK_LEN == 1)
   else if ((newline - buf) >= 2 &&
 		   newline[-2] == CR &&
 		   newline[-1] == LF)
 	{
 	  /* CRLF -> CR or LF */
-	  buf [length - 2] = LINEBREAK[0];
+	  buf [length - 2] = MSG_LINEBREAK[0];
 	  length--;
 	}
   else if (newline > buf + 1 &&
-		   newline[-1] != LINEBREAK[0])
+		   newline[-1] != MSG_LINEBREAK[0])
 	{
 	  /* CR -> LF or LF -> CR */
-	  buf [length - 1] = LINEBREAK[0];
+	  buf [length - 1] = MSG_LINEBREAK[0];
 	}
 #else
   else if (((newline - buf) >= 2 && newline[-2] != CR) ||
@@ -273,8 +273,8 @@ msg_convert_and_send_buffer(char* buf, PRUint32 length, PRBool convert_newlines_
 	{
 	  /* LF -> CRLF or CR -> CRLF */
 	  length++;
-	  buf[length - 2] = LINEBREAK[0];
-	  buf[length - 1] = LINEBREAK[1];
+	  buf[length - 2] = MSG_LINEBREAK[0];
+	  buf[length - 1] = MSG_LINEBREAK[1];
 	}
 #endif
 
@@ -587,7 +587,7 @@ nsNNTPHost::RememberLine(char* line)
 		return NS_ERROR_OUT_OF_MEMORY;
 
 	PL_strcpy(new_data, line);
-	PL_strcat(new_data, LINEBREAK);
+	PL_strcat(new_data, MSG_LINEBREAK);
 
 	m_optionLines = new_data;
 
diff --git a/mailnews/news/src/nsNewsFolder.cpp b/mailnews/news/src/nsNewsFolder.cpp
index a8e62f345b94..cd2f62e2c325 100644
--- a/mailnews/news/src/nsNewsFolder.cpp
+++ b/mailnews/news/src/nsNewsFolder.cpp
@@ -1370,7 +1370,7 @@ nsMsgNewsFolder::RememberLine(char* line)
 	}
 	if (!new_data) return -1; // NS_ERROR_OUT_OF_MEMORY;
 	PL_strcpy(new_data, line);
-	PL_strcat(new_data, LINEBREAK);
+	PL_strcat(new_data, MSG_LINEBREAK);
 
 	mOptionLines = new_data;