Removing references to xp_file.h, for bug 38061. Patch from cls, r=bryner, sr=alecf.

layout/html/forms/src/nsFormFrame.cpp

@@ -105,11 +105,11 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 #include "nsIHTMLContent.h"
 #include "nsIDOMHTMLInputElement.h"
 
-#include "xp_file.h"
 #include "prio.h"
 #include "prmem.h"
 #include "prenv.h"
 #include "prlong.h"
+#include "xp_path.h"  // For PR_DIRECTORY_SEPARATOR_STR
 
 // Rewrite of Multipart form posting
 #include "nsDirectoryServiceDefs.h"

mailnews/addrbook/src/nsDirPrefs.cpp

@@ -53,7 +53,6 @@
 #include "plstr.h"
 #include "prmem.h"
 #include "xp_str.h"
-#include "xp_file.h"
 #include "prprf.h"
 
 static NS_DEFINE_CID(kAddrBookSessionCID, NS_ADDRBOOKSESSION_CID);
@@ -116,6 +115,9 @@ typedef enum
 
 #endif /* #if !defined(MOZADDRSTANDALONE) */
 
+#define XP_FILE_URL_PATH char *
+#define XP_FILE_NATIVE_PATH char *
+
 XP_FILE_URL_PATH	XP_PlatformFileToURL (const XP_FILE_NATIVE_PATH ) {return NULL;}
 
 /*************************************************

mailnews/db/msgdb/src/nsImapMailDatabase.cpp

@@ -35,7 +35,12 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "xp_file.h"
+#ifdef XP_MAC
+#include <stat.h>
+#else
+#include <sys/stat.h>
+#endif
+
 #include "msgCore.h"
 #include "nsImapMailDatabase.h"
 #include "nsDBFolderInfo.h"

mailnews/db/msgdb/src/nsMsgDatabase.cpp

@@ -38,6 +38,12 @@
 
 // this file implements the nsMsgDatabase interface using the MDB Interface.
 
+#ifdef XP_MAC
+#include <stat.h>
+#else
+#include <sys/stat.h>
+#endif
+
 #include "nscore.h"
 #include "msgCore.h"
 #include "nsMsgDatabase.h"
@@ -53,7 +59,7 @@
 #include "nsMsgBaseCID.h"
 #include "nsMorkCID.h"
 #include "nsIMdbFactoryFactory.h"
-#include "xp_file.h"
+#include "prlog.h"
 #include "prprf.h"
 #include "nsTime.h"
 #include "nsIFileSpec.h"