diff --git a/mozilla/gfx/src/nsDeviceContext.cpp b/mozilla/gfx/src/nsDeviceContext.cpp
index 2c211ea7fe4..9b55cc0cd5c 100644
--- a/mozilla/gfx/src/nsDeviceContext.cpp
+++ b/mozilla/gfx/src/nsDeviceContext.cpp
@@ -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.
  */
 
 #include "nsDeviceContext.h"
@@ -73,13 +79,12 @@ DeviceContextImpl :: DeviceContextImpl()
   mColorSpace = nsnull;
 }
 
-static PRBool DeleteValue(nsHashKey* aKey, void* aValue, void* closure)
+static PRBool PR_CALLBACK DeleteValue(nsHashKey* aKey, void* aValue, void* closure)
 {
   delete ((nsString*)aValue);
   return PR_TRUE;
 }
 
-
 DeviceContextImpl :: ~DeviceContextImpl()
 {
   if (nsnull != mFontCache)
@@ -749,7 +754,7 @@ nsresult nsFontCache :: Flush()
   return NS_OK;
 }
 
-#ifdef XP_PC
+#if defined(XP_PC) && !defined(XP_OS2)
 // XXX I had to add this because I changed the link order on Windows
 void notCalled()
 {
diff --git a/mozilla/gfx/src/ps/nsPostScriptObj.cpp b/mozilla/gfx/src/ps/nsPostScriptObj.cpp
index 89aa540c2e0..e9fdb68985d 100644
--- a/mozilla/gfx/src/ps/nsPostScriptObj.cpp
+++ b/mozilla/gfx/src/ps/nsPostScriptObj.cpp
@@ -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.
  */
 
 #include "nscore.h"
@@ -73,7 +79,11 @@ nsPostScriptObj::~nsPostScriptObj()
   if ( mPrintSetup->filename != (char *) NULL )
 	fclose( mPrintSetup->out );
   else
+#ifdef XP_OS2_VACPP
+        // pclose not defined OS2TODO
+#else
 	pclose( mPrintSetup->out );
+#endif
 #ifdef VMS
   if ( mPrintSetup->print_cmd != (char *) NULL ) {
     char VMSPrintCommand[1024];
@@ -145,7 +155,11 @@ printf( "top %f bottom %f left %f right %f\n", top, bottom, left, right );
       if ( isAPrinter == PR_TRUE ) {
 #ifndef VMS
         aSpec->GetCommand( &buf );
+#ifdef XP_OS2_VACPP
+        // popen not defined OS2TODO
+#else
         mPrintSetup->out = popen( buf, "w" );
+#endif
         mPrintSetup->filename = (char *) NULL;  
 #else
         // We can not open a pipe and print the contents of it. Instead