Bug 508760 - Remove MSVC6 support from the tree; (Iv1) /toolkit/xre/*.cpp.
authorSerge Gautherie <sgautherie.bz@free.fr>
Thu, 09 Dec 2010 16:43:13 +0100
changeset 58973 37c63f75ff2f13195896caa8efd9315071761a28
parent 58972 22bb9d6626c55a06df98fc12e5617fb9f04b2d43
child 58974 031a062400ff7ad25cb5c4100cf021ce1be9c960
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
bugs508760
milestone2.0b8pre
Bug 508760 - Remove MSVC6 support from the tree; (Iv1) /toolkit/xre/*.cpp. r+a-2.0=benjamin. DONTBUILD
toolkit/xre/nsWindowsRestart.cpp
toolkit/xre/nsXREDirProvider.cpp
--- a/toolkit/xre/nsWindowsRestart.cpp
+++ b/toolkit/xre/nsWindowsRestart.cpp
@@ -100,19 +100,19 @@ static int ArgStrLen(const PRUnichar *s)
   }
 
   return i;
 }
 
 /**
  * Copy string "s" to string "d", quoting the argument as appropriate and
  * escaping doublequotes along with any backslashes that immediately precede
- * duoblequotes.
+ * doublequotes.
  * The CRT parses this to retrieve the original argc/argv that we meant,
- * see STDARGV.C in the MSVC6 CRT sources.
+ * see STDARGV.C in the MSVC CRT sources.
  *
  * @return the end of the string
  */
 static PRUnichar* ArgToString(PRUnichar *d, const PRUnichar *s)
 {
   int backslashes = 0;
   BOOL hasDoubleQuote = wcschr(s, L'"') != NULL;
   // Only add doublequotes if the string contains a space or a tab
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -69,20 +69,16 @@
 #include "mozilla/Services.h"
 #include "mozilla/Omnijar.h"
 
 #include <stdlib.h>
 
 #ifdef XP_WIN
 #include <windows.h>
 #include <shlobj.h>
-// This is not defined by VC6.
-#ifndef CSIDL_LOCAL_APPDATA
-#define CSIDL_LOCAL_APPDATA             0x001C
-#endif
 #endif
 #ifdef XP_MACOSX
 #include "nsILocalFileMac.h"
 #endif
 #ifdef XP_BEOS
 #include <be/kernel/image.h>
 #include <FindDirectory.h>
 #endif