From a24e0c321dcad954f5ba4b13cd5952548321cdf5 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Tue, 11 Aug 2009 00:37:37 +0200
Subject: [PATCH] Bug 508760 - Remove MSVC6 support from the tree; (Cv1a)
 xpcom/io/*.cpp; r=doug.turner

---
 xpcom/io/SpecialSystemDirectory.cpp | 10 ++++------
 xpcom/io/nsLocalFileWin.cpp         | 10 ----------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/xpcom/io/SpecialSystemDirectory.cpp b/xpcom/io/SpecialSystemDirectory.cpp
index f59917697b5f..101f24b88d0b 100644
--- a/xpcom/io/SpecialSystemDirectory.cpp
+++ b/xpcom/io/SpecialSystemDirectory.cpp
@@ -53,12 +53,10 @@
 #include <string.h>
 #include <direct.h>
 
-// These are not defined by VC6.
-#ifndef CSIDL_LOCAL_APPDATA
-#define CSIDL_LOCAL_APPDATA             0x001C
-#endif
-#ifndef CSIDL_PROGRAM_FILES
-#define CSIDL_PROGRAM_FILES             0x0026
+#ifdef WINCE
+// CSIDL_LOCAL_APPDATA is not defined on WinCE:
+// fall back to CSIDL_APPDATA.
+#define CSIDL_LOCAL_APPDATA CSIDL_APPDATA
 #endif
 
 #elif defined(XP_OS2)
diff --git a/xpcom/io/nsLocalFileWin.cpp b/xpcom/io/nsLocalFileWin.cpp
index 747e33d4cb61..10893c8aa0c8 100644
--- a/xpcom/io/nsLocalFileWin.cpp
+++ b/xpcom/io/nsLocalFileWin.cpp
@@ -312,16 +312,6 @@ static nsresult ConvertWinError(DWORD winErr)
     return rv;
 }
 
-// definition of INVALID_SET_FILE_POINTER from VC.NET header files
-// it doesn't appear to be defined by VC6
-#ifndef INVALID_SET_FILE_POINTER
-# define INVALID_SET_FILE_POINTER ((DWORD)-1)
-#endif
-// same goes for INVALID_FILE_ATTRIBUTES
-#ifndef INVALID_FILE_ATTRIBUTES
-# define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
-#endif
-
 // as suggested in the MSDN documentation on SetFilePointer
 static __int64 
 MyFileSeek64(HANDLE aHandle, __int64 aDistance, DWORD aMoveMethod)