Removing dependence on obsolete headers. Bug 38061 (ongoing work). r=shaver, sr=brendan.

extensions/psm-glue/src/nsFSDR.cpp

@@ -45,7 +45,7 @@
 #include "nsFileLocations.h"
 #include "prmem.h"
 #include "prprf.h"  
-#include "ntypes.h"
+#include "xp_core.h"
 #include "nsIPref.h"
 
 static NS_DEFINE_IID(kIIOServiceIID, NS_IIOSERVICE_IID);

extensions/wallet/src/singsign.h

@@ -29,7 +29,7 @@
 #ifndef _SINGSIGN_H
 #define _SINGSIGN_H
 
-#include "ntypes.h"
+#include "xp_core.h"
 #include "nsString.h"
 #include "nsVoidArray.h"
 #include "nsIPref.h"

extensions/wallet/src/wallet.h

@@ -29,7 +29,7 @@
 #ifndef _WALLET_H
 #define _WALLET_H
 
-#include "ntypes.h"
+#include "xp_core.h"
 #include "nsIPresShell.h"
 #include "nsString.h"
 #include "nsFileSpec.h"

gfx/src/ps/nsPostScriptObj.cpp

@@ -278,9 +278,13 @@ printf( "dpi %f top %d bottom %d left %d right %d\n", mPrintSetup->dpi, mPrintSe
     mPrintSetup->eol = "";			    // For text translation, line terminator 
     mPrintSetup->bullet = "+";                 // What char to use for bullets 
 
+#ifdef NOTYET
     URL_Struct_* url = new URL_Struct_;
     memset(url, 0, sizeof(URL_Struct_));
     mPrintSetup->url = url;                    // url of doc being translated 
+#else
+    mPrintSetup->url = nsnull;
+#endif
     mPrintSetup->completion = NULL;            // Called when translation finished 
     mPrintSetup->carg = NULL;                  // Data saved for completion routine 
     mPrintSetup->status = 0;                   // Status of URL on completion 

gfx/src/ps/nsPostScriptObj.h

@@ -27,8 +27,6 @@
 
 #include "xp_core.h"
 #include "xp_file.h"
-#include "ntypes.h"
-#include "net.h"
 #ifdef __cplusplus
 #include "nsColor.h"
 #include "nsCoord.h"

gfx/src/xprint/nsXPrintContext.h

@@ -28,8 +28,6 @@
 #include <X11/extensions/Print.h>
 #include "xp_core.h"
 #include "xp_file.h"
-#include "ntypes.h"
-#include "net.h"
 #include "nsColor.h"
 #include "nsCoord.h"
 #include "nsString.h"

modules/libimg/public/xpcompat.h

@@ -32,7 +32,7 @@
 #ifndef xpcompat_h___
 #define xpcompat_h___
 
-#include "platform.h"
+#include "xp_core.h"
 #include "prtypes.h"
 #include "nsCom.h"
 

profile/pref-migrator/src/nsPrefMigration.cpp

@@ -79,8 +79,6 @@
 
 /* Network */
 
-#include "net.h"
-
 #include "nsPrefMigration.h"
 #include "nsPrefMigrationFactory.h"