Bug 860966 - Compile failure in msgMapiImp.cpp with Visual Studio 2012. r=standard8
authorFrank Wein <bugzilla@mcsmurf.de>
Thu, 18 Apr 2013 10:08:15 +0900
changeset 15397 7ec742c695b8ec67cdaf81cce89ac88adef76e53
parent 15396 09c9f84de3e17facdaa8f17f7294530c57f3020b
child 15398 fdd3e4d771972ba9188fd6d6b6f0e45eeb74c725
push id920
push userbugzilla@standard8.plus.com
push dateMon, 24 Jun 2013 19:03:14 +0000
treeherdercomm-beta@936bfe9d120b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersstandard8
bugs860966
Bug 860966 - Compile failure in msgMapiImp.cpp with Visual Studio 2012. r=standard8
mailnews/mapi/mapihook/src/msgMapiImp.cpp
--- a/mailnews/mapi/mapihook/src/msgMapiImp.cpp
+++ b/mailnews/mapi/mapihook/src/msgMapiImp.cpp
@@ -331,17 +331,17 @@ protected:
   nsCOMPtr <nsISimpleEnumerator> m_msgEnumerator;
 };
 
 
 LONG CMapiImp::InitContext(unsigned long session, MsgMapiListContext **listContext)
 {
   nsMAPIConfiguration * pMapiConfig = nsMAPIConfiguration::GetMAPIConfiguration() ;
   if (!pMapiConfig)
-    return NS_ERROR_FAILURE ;  // get the singelton obj
+    return MAPI_E_FAILURE ;  // get the singelton obj
   *listContext = (MsgMapiListContext *) pMapiConfig->GetMapiListContext(session);
   // This is the first message
   if (!*listContext)
   {
     nsCOMPtr <nsIMsgFolder> inboxFolder;
     nsresult rv = GetDefaultInbox(getter_AddRefs(inboxFolder));
     if (NS_FAILED(rv))
     {
@@ -377,17 +377,17 @@ STDMETHODIMP CMapiImp::FindNext(unsigned
   // and we should start the enumeration operation.
   //
 
   *lpszMessageID = '\0';
   nsMAPIConfiguration * pMapiConfig = nsMAPIConfiguration::GetMAPIConfiguration() ;
   if (!pMapiConfig) 
   {
     NS_ASSERTION(false, "failed to get config in findnext");
-    return NS_ERROR_FAILURE ;  // get the singelton obj
+    return MAPI_E_FAILURE ;  // get the singelton obj
   }
   MsgMapiListContext *listContext;
   LONG ret = InitContext(aSession, &listContext);
   if (ret != SUCCESS_SUCCESS)
   {
     NS_ASSERTION(false, "init context failed");
     return ret;
   }