From 21bcdf8ac8796602716926dcebd1ac7bd3242f3d Mon Sep 17 00:00:00 2001
From: "sfraser%netscape.com"
 <sfraser%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 4 Apr 2000 01:43:32 +0000
Subject: [PATCH] Fix bustage. NS_IMETHODIMP and nsresult don't mix on windows.

git-svn-id: svn://10.0.0.236/trunk@65122 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/editor/base/nsEditorShell.cpp         | 2 +-
 mozilla/editor/composer/src/nsEditorShell.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mozilla/editor/base/nsEditorShell.cpp b/mozilla/editor/base/nsEditorShell.cpp
index 3e6b55ddcb0..ec992b1a24c 100644
--- a/mozilla/editor/base/nsEditorShell.cpp
+++ b/mozilla/editor/base/nsEditorShell.cpp
@@ -274,7 +274,7 @@ nsEditorShell::Init()
   return NS_OK;
 }
 
-NS_IMETHODIMP    
+nsresult    
 nsEditorShell::PrepareDocumentForEditing(nsIDocumentLoader* aLoader, nsIURI *aUrl)
 {
   if (!mContentAreaWebShell)
diff --git a/mozilla/editor/composer/src/nsEditorShell.cpp b/mozilla/editor/composer/src/nsEditorShell.cpp
index 3e6b55ddcb0..ec992b1a24c 100644
--- a/mozilla/editor/composer/src/nsEditorShell.cpp
+++ b/mozilla/editor/composer/src/nsEditorShell.cpp
@@ -274,7 +274,7 @@ nsEditorShell::Init()
   return NS_OK;
 }
 
-NS_IMETHODIMP    
+nsresult    
 nsEditorShell::PrepareDocumentForEditing(nsIDocumentLoader* aLoader, nsIURI *aUrl)
 {
   if (!mContentAreaWebShell)