From bd2862b6e818f614c4abef56d2f4a18b47dc6e57 Mon Sep 17 00:00:00 2001
From: "alecf%netscape.com"
 <alecf%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 8 Sep 1999 03:56:37 +0000
Subject: [PATCH] switch to using correct NSPR types and PR_TRUE/PR_FALSE/etc

git-svn-id: svn://10.0.0.236/trunk@46292 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/include/libi18n.h                       | 12 ++++++------
 mozilla/mailnews/mime/src/comi18n.cpp           |  6 +++---
 mozilla/mailnews/mime/src/comi18n.h             |  7 +++----
 mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/mozilla/include/libi18n.h b/mozilla/include/libi18n.h
index dd550189b89..b5df9d05ab6 100644
--- a/mozilla/include/libi18n.h
+++ b/mozilla/include/libi18n.h
@@ -1180,8 +1180,8 @@ PUBLIC char *INTL_GetAcceptCharset(void);
  */
 PUBLIC char *INTL_DecodeMimePartIIStr(
     const char *header, 
-    int16 wincsid, 
-    XP_Bool dontConvert
+    PRInt16 wincsid, 
+    PRBool dontConvert
 );
 
 /**
@@ -1208,8 +1208,8 @@ PUBLIC char *INTL_DecodeMimePartIIStr(
  */
 PUBLIC char *INTL_EncodeMimePartIIStr(
     char *header, 
-    int16 wincsid, 
-    XP_Bool bUseMime
+    PRInt16 wincsid, 
+    PRBool bUseMime
 );
 
 /**
@@ -1237,8 +1237,8 @@ PUBLIC char *INTL_EncodeMimePartIIStr(
  */
 PUBLIC char *INTL_EncodeMimePartIIStr_VarLen(
     char * header, 
-    int16 wincsid, 
-    XP_Bool bUseMime, 
+    PRInt16 wincsid, 
+    PRBool bUseMime, 
     int encodedWordSize
 );
 
diff --git a/mozilla/mailnews/mime/src/comi18n.cpp b/mozilla/mailnews/mime/src/comi18n.cpp
index a4430f90015..8bdd18e14b4 100644
--- a/mozilla/mailnews/mime/src/comi18n.cpp
+++ b/mozilla/mailnews/mime/src/comi18n.cpp
@@ -1515,12 +1515,12 @@ PRBool MimeCharsetConverterClass::NeedCharsetConversion(const nsString& from_cha
 // BEGIN PUBLIC INTERFACE
 extern "C" {
 #define PUBLIC
-PUBLIC char *INTL_DecodeMimePartIIStr(const char *header, int16 wincsid, XP_Bool dontConvert)
+PUBLIC char *INTL_DecodeMimePartIIStr(const char *header, PRInt16 wincsid, PRBool dontConvert)
 {
 // Obsolescent
   return PL_strdup(header);
 }
-PUBLIC char *INTL_EncodeMimePartIIStr(char *subject, int16 wincsid, XP_Bool bUseMime)
+PUBLIC char *INTL_EncodeMimePartIIStr(char *subject, PRInt16 wincsid, PRBool bUseMime)
 {
 // Obsolescent
   return PL_strdup(subject);
@@ -1529,7 +1529,7 @@ PUBLIC char *INTL_EncodeMimePartIIStr(char *subject, int16 wincsid, XP_Bool bUse
     The reason why we specify a different length here is because we are not encoding
     the string for use in a mail message, but rather want to stuff as much content
     into the subject string as possible. */
-PUBLIC char *INTL_EncodeMimePartIIStr_VarLen(char *subject, int16 wincsid, XP_Bool bUseMime, int encodedWordSize)
+PUBLIC char *INTL_EncodeMimePartIIStr_VarLen(char *subject, PRInt16 wincsid, PRBool bUseMime, int encodedWordSize)
 {
 // Obsolescent
   return PL_strdup(subject);
diff --git a/mozilla/mailnews/mime/src/comi18n.h b/mozilla/mailnews/mime/src/comi18n.h
index a8d19372a3b..b3ae197fc65 100644
--- a/mozilla/mailnews/mime/src/comi18n.h
+++ b/mozilla/mailnews/mime/src/comi18n.h
@@ -25,7 +25,6 @@
 #define kMAX_CSNAME 64
 #endif
 
-#include "xp_core.h"
   
 #ifdef __cplusplus
 extern "C" {
@@ -137,9 +136,9 @@ char * NextChar_UTF8(char *str);
 /*
  * To be removed. Existing for the backword compatibility. 
  */
-char *INTL_DecodeMimePartIIStr(const char *header, int16 wincsid, XP_Bool dontConvert);
-char *INTL_EncodeMimePartIIStr(char *subject, int16 wincsid, XP_Bool bUseMime);
-char *INTL_EncodeMimePartIIStr_VarLen(char *subject, int16 wincsid, XP_Bool bUseMime, int encodedWordSize);
+char *INTL_DecodeMimePartIIStr(const char *header, PRInt16 wincsid, PRBool dontConvert);
+char *INTL_EncodeMimePartIIStr(char *subject, PRInt16 wincsid, PRBool bUseMime);
+char *INTL_EncodeMimePartIIStr_VarLen(char *subject, PRInt16 wincsid, PRBool bUseMime, int encodedWordSize);
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp b/mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp
index 238d783a15f..b6e52d64f4b 100644
--- a/mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp
+++ b/mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "msgCore.h"    // precompiled header...
-
+#include "xp_core.h"            // for FALSE
 #include "nsISupports.h"
 #include "nsIMsgHeaderParser.h"
 #include "nsMsgHeaderParser.h"