diff --git a/mozilla/htmlparser/src/nsDTDDebug.cpp b/mozilla/htmlparser/src/nsDTDDebug.cpp
index 6fcc8956a48..92f1e2be1e3 100644
--- a/mozilla/htmlparser/src/nsDTDDebug.cpp
+++ b/mozilla/htmlparser/src/nsDTDDebug.cpp
@@ -18,6 +18,7 @@
  * Rights Reserved.
  *
  * Contributor(s): 
+ *   IBM Corp.
  */
   
 /**
@@ -296,7 +297,7 @@ PRBool CDTDDebug::DebugRecord(char * path, nsString& aURLRef, char * filename)
  * sorts in descending order
  */
 
-static int compare( const void *arg1, const void *arg2 , void *unused)
+static int PR_CALLBACK compare( const void *arg1, const void *arg2 , void *unused)
 {
 	VectorInfo ** p1 = (VectorInfo**)arg1;
 	VectorInfo ** p2 = (VectorInfo**)arg2;
diff --git a/mozilla/htmlparser/src/nsExpatDTD.h b/mozilla/htmlparser/src/nsExpatDTD.h
index 8542e95fd6f..72c88ec5a92 100644
--- a/mozilla/htmlparser/src/nsExpatDTD.h
+++ b/mozilla/htmlparser/src/nsExpatDTD.h
@@ -18,6 +18,12 @@
  * Rights Reserved.
  *
  * Contributor(s): 
+ * This Original Code has been modified by IBM Corporation. Modifications made by IBM 
+ * described herein are Copyright (c) International Business Machines Corporation, 2000.
+ * Modifications to Mozilla code or documentation identified per MPL Section 3.3
+ *
+ * Date             Modified by     Description of modification
+ * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
 
 /**
@@ -247,30 +253,30 @@ protected:
     void SetupExpatCallbacks(void);
 
     /* The callback handlers that get called from the expat parser */
-    static void HandleStartElement(void *userData, const XML_Char *name, const XML_Char **atts);
-    static void HandleEndElement(void *userData, const XML_Char *name);
-    static void HandleCharacterData(void *userData, const XML_Char *s, int len);
-    static void HandleProcessingInstruction(void *userData, 
+    static void PR_CALLBACK HandleStartElement(void *userData, const XML_Char *name, const XML_Char **atts);
+    static void PR_CALLBACK HandleEndElement(void *userData, const XML_Char *name);
+    static void PR_CALLBACK HandleCharacterData(void *userData, const XML_Char *s, int len);
+    static void PR_CALLBACK HandleProcessingInstruction(void *userData, 
       const XML_Char *target, 
       const XML_Char *data);
-    static void HandleDefault(void *userData, const XML_Char *s, int len);
-    static void HandleUnparsedEntityDecl(void *userData, 
+    static void PR_CALLBACK HandleDefault(void *userData, const XML_Char *s, int len);
+    static void PR_CALLBACK HandleUnparsedEntityDecl(void *userData, 
       const XML_Char *entityName, 
       const XML_Char *base, 
       const XML_Char *systemId, 
       const XML_Char *publicId,
       const XML_Char *notationName);
-    static void HandleNotationDecl(void *userData,
+    static void PR_CALLBACK HandleNotationDecl(void *userData,
       const XML_Char *notationName,
       const XML_Char *base,
       const XML_Char *systemId,
       const XML_Char *publicId);
-    static void HandleExternalEntityRef(XML_Parser parser,
+    static void PR_CALLBACK HandleExternalEntityRef(XML_Parser parser,
       const XML_Char *openEntityNames,
       const XML_Char *base,
       const XML_Char *systemId,
       const XML_Char *publicId);
-    static void HandleUnknownEncoding(void *encodingHandlerData,
+    static void PR_CALLBACK HandleUnknownEncoding(void *encodingHandlerData,
       const XML_Char *name,
       XML_Encoding *info);
   
diff --git a/mozilla/htmlparser/src/nsExpatTokenizer.h b/mozilla/htmlparser/src/nsExpatTokenizer.h
index 16550363aa9..56af4b75576 100644
--- a/mozilla/htmlparser/src/nsExpatTokenizer.h
+++ b/mozilla/htmlparser/src/nsExpatTokenizer.h
@@ -18,6 +18,12 @@
  * Rights Reserved.
  *
  * Contributor(s): 
+ * This Original Code has been modified by IBM Corporation. Modifications made by IBM 
+ * described herein are Copyright (c) International Business Machines Corporation, 2000.
+ * Modifications to Mozilla code or documentation identified per MPL Section 3.3
+ *
+ * Date             Modified by     Description of modification
+ * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
 
 
@@ -111,38 +117,38 @@ protected:
                              PRUint32 &retLen);
 
   /* The callback handlers that get called from the expat parser */
-  static void HandleStartElement(void *userData, const XML_Char *name, const XML_Char **atts);
-  static void HandleEndElement(void *userData, const XML_Char *name);
-  static void HandleCharacterData(void *userData, const XML_Char *s, int len);
-  static void HandleComment(void *userData, const XML_Char *name);
-  static void HandleProcessingInstruction(void *userData, 
+  static void PR_CALLBACK HandleStartElement(void *userData, const XML_Char *name, const XML_Char **atts);
+  static void PR_CALLBACK HandleEndElement(void *userData, const XML_Char *name);
+  static void PR_CALLBACK HandleCharacterData(void *userData, const XML_Char *s, int len);
+  static void PR_CALLBACK HandleComment(void *userData, const XML_Char *name);
+  static void PR_CALLBACK HandleProcessingInstruction(void *userData, 
     const XML_Char *target, 
     const XML_Char *data);
-  static void HandleDefault(void *userData, const XML_Char *s, int len);
-  static void HandleStartCdataSection(void *userData);
-  static void HandleEndCdataSection(void *userData);
-  static void HandleUnparsedEntityDecl(void *userData, 
+  static void PR_CALLBACK HandleDefault(void *userData, const XML_Char *s, int len);
+  static void PR_CALLBACK HandleStartCdataSection(void *userData);
+  static void PR_CALLBACK HandleEndCdataSection(void *userData);
+  static void PR_CALLBACK HandleUnparsedEntityDecl(void *userData, 
     const XML_Char *entityName, 
     const XML_Char *base, 
     const XML_Char *systemId, 
     const XML_Char *publicId,
     const XML_Char *notationName);
-  static void HandleNotationDecl(void *userData,
+  static void PR_CALLBACK HandleNotationDecl(void *userData,
     const XML_Char *notationName,
     const XML_Char *base,
     const XML_Char *systemId,
     const XML_Char *publicId);
-  static int HandleExternalEntityRef(XML_Parser parser,
+  static int PR_CALLBACK HandleExternalEntityRef(XML_Parser parser,
     const XML_Char *openEntityNames,
     const XML_Char *base,
     const XML_Char *systemId,
     const XML_Char *publicId);
-  static int HandleUnknownEncoding(void *encodingHandlerData,
+  static int PR_CALLBACK HandleUnknownEncoding(void *encodingHandlerData,
     const XML_Char *name,
     XML_Encoding *info);
-  static void HandleStartDoctypeDecl(void *userData,
+  static void PR_CALLBACK HandleStartDoctypeDecl(void *userData,
     const XML_Char *doctypeName);
-  static void HandleEndDoctypeDecl(void *userData);
+  static void PR_CALLBACK HandleEndDoctypeDecl(void *userData);
 
   XML_Parser mExpatParser;
 	PRUint32 mBytesParsed;
diff --git a/mozilla/parser/htmlparser/src/nsDTDDebug.cpp b/mozilla/parser/htmlparser/src/nsDTDDebug.cpp
index 6fcc8956a48..92f1e2be1e3 100644
--- a/mozilla/parser/htmlparser/src/nsDTDDebug.cpp
+++ b/mozilla/parser/htmlparser/src/nsDTDDebug.cpp
@@ -18,6 +18,7 @@
  * Rights Reserved.
  *
  * Contributor(s): 
+ *   IBM Corp.
  */
   
 /**
@@ -296,7 +297,7 @@ PRBool CDTDDebug::DebugRecord(char * path, nsString& aURLRef, char * filename)
  * sorts in descending order
  */
 
-static int compare( const void *arg1, const void *arg2 , void *unused)
+static int PR_CALLBACK compare( const void *arg1, const void *arg2 , void *unused)
 {
 	VectorInfo ** p1 = (VectorInfo**)arg1;
 	VectorInfo ** p2 = (VectorInfo**)arg2;
diff --git a/mozilla/parser/htmlparser/src/nsExpatDTD.h b/mozilla/parser/htmlparser/src/nsExpatDTD.h
index 8542e95fd6f..72c88ec5a92 100644
--- a/mozilla/parser/htmlparser/src/nsExpatDTD.h
+++ b/mozilla/parser/htmlparser/src/nsExpatDTD.h
@@ -18,6 +18,12 @@
  * Rights Reserved.
  *
  * Contributor(s): 
+ * This Original Code has been modified by IBM Corporation. Modifications made by IBM 
+ * described herein are Copyright (c) International Business Machines Corporation, 2000.
+ * Modifications to Mozilla code or documentation identified per MPL Section 3.3
+ *
+ * Date             Modified by     Description of modification
+ * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
 
 /**
@@ -247,30 +253,30 @@ protected:
     void SetupExpatCallbacks(void);
 
     /* The callback handlers that get called from the expat parser */
-    static void HandleStartElement(void *userData, const XML_Char *name, const XML_Char **atts);
-    static void HandleEndElement(void *userData, const XML_Char *name);
-    static void HandleCharacterData(void *userData, const XML_Char *s, int len);
-    static void HandleProcessingInstruction(void *userData, 
+    static void PR_CALLBACK HandleStartElement(void *userData, const XML_Char *name, const XML_Char **atts);
+    static void PR_CALLBACK HandleEndElement(void *userData, const XML_Char *name);
+    static void PR_CALLBACK HandleCharacterData(void *userData, const XML_Char *s, int len);
+    static void PR_CALLBACK HandleProcessingInstruction(void *userData, 
       const XML_Char *target, 
       const XML_Char *data);
-    static void HandleDefault(void *userData, const XML_Char *s, int len);
-    static void HandleUnparsedEntityDecl(void *userData, 
+    static void PR_CALLBACK HandleDefault(void *userData, const XML_Char *s, int len);
+    static void PR_CALLBACK HandleUnparsedEntityDecl(void *userData, 
       const XML_Char *entityName, 
       const XML_Char *base, 
       const XML_Char *systemId, 
       const XML_Char *publicId,
       const XML_Char *notationName);
-    static void HandleNotationDecl(void *userData,
+    static void PR_CALLBACK HandleNotationDecl(void *userData,
       const XML_Char *notationName,
       const XML_Char *base,
       const XML_Char *systemId,
       const XML_Char *publicId);
-    static void HandleExternalEntityRef(XML_Parser parser,
+    static void PR_CALLBACK HandleExternalEntityRef(XML_Parser parser,
       const XML_Char *openEntityNames,
       const XML_Char *base,
       const XML_Char *systemId,
       const XML_Char *publicId);
-    static void HandleUnknownEncoding(void *encodingHandlerData,
+    static void PR_CALLBACK HandleUnknownEncoding(void *encodingHandlerData,
       const XML_Char *name,
       XML_Encoding *info);
   
diff --git a/mozilla/parser/htmlparser/src/nsExpatTokenizer.h b/mozilla/parser/htmlparser/src/nsExpatTokenizer.h
index 16550363aa9..56af4b75576 100644
--- a/mozilla/parser/htmlparser/src/nsExpatTokenizer.h
+++ b/mozilla/parser/htmlparser/src/nsExpatTokenizer.h
@@ -18,6 +18,12 @@
  * Rights Reserved.
  *
  * Contributor(s): 
+ * This Original Code has been modified by IBM Corporation. Modifications made by IBM 
+ * described herein are Copyright (c) International Business Machines Corporation, 2000.
+ * Modifications to Mozilla code or documentation identified per MPL Section 3.3
+ *
+ * Date             Modified by     Description of modification
+ * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
 
 
@@ -111,38 +117,38 @@ protected:
                              PRUint32 &retLen);
 
   /* The callback handlers that get called from the expat parser */
-  static void HandleStartElement(void *userData, const XML_Char *name, const XML_Char **atts);
-  static void HandleEndElement(void *userData, const XML_Char *name);
-  static void HandleCharacterData(void *userData, const XML_Char *s, int len);
-  static void HandleComment(void *userData, const XML_Char *name);
-  static void HandleProcessingInstruction(void *userData, 
+  static void PR_CALLBACK HandleStartElement(void *userData, const XML_Char *name, const XML_Char **atts);
+  static void PR_CALLBACK HandleEndElement(void *userData, const XML_Char *name);
+  static void PR_CALLBACK HandleCharacterData(void *userData, const XML_Char *s, int len);
+  static void PR_CALLBACK HandleComment(void *userData, const XML_Char *name);
+  static void PR_CALLBACK HandleProcessingInstruction(void *userData, 
     const XML_Char *target, 
     const XML_Char *data);
-  static void HandleDefault(void *userData, const XML_Char *s, int len);
-  static void HandleStartCdataSection(void *userData);
-  static void HandleEndCdataSection(void *userData);
-  static void HandleUnparsedEntityDecl(void *userData, 
+  static void PR_CALLBACK HandleDefault(void *userData, const XML_Char *s, int len);
+  static void PR_CALLBACK HandleStartCdataSection(void *userData);
+  static void PR_CALLBACK HandleEndCdataSection(void *userData);
+  static void PR_CALLBACK HandleUnparsedEntityDecl(void *userData, 
     const XML_Char *entityName, 
     const XML_Char *base, 
     const XML_Char *systemId, 
     const XML_Char *publicId,
     const XML_Char *notationName);
-  static void HandleNotationDecl(void *userData,
+  static void PR_CALLBACK HandleNotationDecl(void *userData,
     const XML_Char *notationName,
     const XML_Char *base,
     const XML_Char *systemId,
     const XML_Char *publicId);
-  static int HandleExternalEntityRef(XML_Parser parser,
+  static int PR_CALLBACK HandleExternalEntityRef(XML_Parser parser,
     const XML_Char *openEntityNames,
     const XML_Char *base,
     const XML_Char *systemId,
     const XML_Char *publicId);
-  static int HandleUnknownEncoding(void *encodingHandlerData,
+  static int PR_CALLBACK HandleUnknownEncoding(void *encodingHandlerData,
     const XML_Char *name,
     XML_Encoding *info);
-  static void HandleStartDoctypeDecl(void *userData,
+  static void PR_CALLBACK HandleStartDoctypeDecl(void *userData,
     const XML_Char *doctypeName);
-  static void HandleEndDoctypeDecl(void *userData);
+  static void PR_CALLBACK HandleEndDoctypeDecl(void *userData);
 
   XML_Parser mExpatParser;
 	PRUint32 mBytesParsed;