Bug 508760 - Remove MSVC6 support from the tree; (Cv1a) xpcom/io/*.cpp; r=doug.turner

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)

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)