From d56a32bce4861a061076e1f437e4889a3852d294 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Wed, 7 Jan 2015 12:16:14 -0500
Subject: [PATCH] Bug 1119068 - Clean up some code used for older unsupported
 MSVC versions; r=bsmedberg

---
 gfx/ycbcr/moz.build                           | 12 +++-------
 ipc/app/sha256.c                              | 24 +------------------
 .../client/crashreporter_win.cpp              | 19 ++++-----------
 toolkit/mozapps/installer/upload-files.mk     |  8 -------
 toolkit/xre/WindowsCrtPatch.h                 |  6 +----
 5 files changed, 9 insertions(+), 60 deletions(-)

diff --git a/gfx/ycbcr/moz.build b/gfx/ycbcr/moz.build
index 4ef457d3f776..1f0834504601 100644
--- a/gfx/ycbcr/moz.build
+++ b/gfx/ycbcr/moz.build
@@ -38,15 +38,9 @@ if CONFIG['INTEL_ARCHITECTURE']:
 
 if CONFIG['_MSC_VER']:
     if CONFIG['OS_TEST'] == 'x86_64':
-        if CONFIG['_MSC_VER'] == '1400':
-            # VC8 doesn't support some SSE2 built-in functions
-            SOURCES += [
-                'yuv_row_win.cpp',
-            ]
-        else:
-            SOURCES += [
-                'yuv_row_win64.cpp',
-            ]
+        SOURCES += [
+            'yuv_row_win64.cpp',
+        ]
     else:
         SOURCES += [
             'yuv_row_win.cpp',
diff --git a/ipc/app/sha256.c b/ipc/app/sha256.c
index 951dd35e8e7b..072de5195ead 100644
--- a/ipc/app/sha256.c
+++ b/ipc/app/sha256.c
@@ -68,33 +68,11 @@ static const PRUint32 H256[8] = {
     0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19
 };
 
-#if (_MSC_VER >= 1300)
+#if defined(_MSC_VER)
 #include <stdlib.h>
 #pragma intrinsic(_byteswap_ulong)
 #define SHA_HTONL(x) _byteswap_ulong(x)
 #define BYTESWAP4(x)  x = SHA_HTONL(x)
-#elif defined(_MSC_VER) && defined(NSS_X86_OR_X64)
-#ifndef FORCEINLINE
-#if (_MSC_VER >= 1200)
-#define FORCEINLINE __forceinline
-#else
-#define FORCEINLINE __inline
-#endif
-#endif
-#define FASTCALL __fastcall
-
-static FORCEINLINE PRUint32 FASTCALL 
-swap4b(PRUint32 dwd) 
-{
-    __asm {
-    	mov   eax,dwd
-	bswap eax
-    }
-}
-
-#define SHA_HTONL(x) swap4b(x)
-#define BYTESWAP4(x)  x = SHA_HTONL(x)
-
 #elif defined(__GNUC__) && defined(NSS_X86_OR_X64)
 static __inline__ PRUint32 swap4b(PRUint32 value)
 {
diff --git a/toolkit/crashreporter/client/crashreporter_win.cpp b/toolkit/crashreporter/client/crashreporter_win.cpp
index fd864f921c49..9edcb6dd38c9 100644
--- a/toolkit/crashreporter/client/crashreporter_win.cpp
+++ b/toolkit/crashreporter/client/crashreporter_win.cpp
@@ -1439,19 +1439,13 @@ ifstream* UIOpenRead(const string& filename)
 {
   // adapted from breakpad's src/common/windows/http_upload.cc
 
-  // The "open" method on pre-MSVC8 ifstream implementations doesn't accept a
-  // wchar_t* filename, so use _wfopen directly in that case.  For VC8 and
-  // later, _wfopen has been deprecated in favor of _wfopen_s, which does
-  // not exist in earlier versions, so let the ifstream open the file itself.
-#if _MSC_VER >= 1400  // MSVC 2005/8
+#if defined(_MSC_VER)
   ifstream* file = new ifstream();
   file->open(UTF8ToWide(filename).c_str(), ios::in);
-#elif defined(_MSC_VER)
-  ifstream* file = new ifstream(_wfopen(UTF8ToWide(filename).c_str(), L"r"));
 #else   // GCC
   ifstream* file = new ifstream(WideToMBCP(UTF8ToWide(filename), CP_ACP).c_str(),
                                 ios::in);
-#endif  // _MSC_VER >= 1400
+#endif  // _MSC_VER
 
   return file;
 }
@@ -1469,18 +1463,13 @@ ofstream* UIOpenWrite(const string& filename,
     mode = mode | ios::binary;
   }
 
-  // For VC8 and later, _wfopen has been deprecated in favor of _wfopen_s,
-  // which does not exist in earlier versions, so let the ifstream open the
-  // file itself.
-#if _MSC_VER >= 1400  // MSVC 2005/8
+#if defined(_MSC_VER)
   ofstream* file = new ofstream();
   file->open(UTF8ToWide(filename).c_str(), mode);
-#elif defined(_MSC_VER)
-#error "Compiling with your version of MSVC is no longer supported."
 #else   // GCC
   ofstream* file = new ofstream(WideToMBCP(UTF8ToWide(filename), CP_ACP).c_str(),
                                 mode);
-#endif  // _MSC_VER >= 1400
+#endif  // _MSC_VER
 
   return file;
 }
diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
index 118e08ab8fa0..4adda194ed7e 100644
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -66,14 +66,6 @@ JSSHELL_BINS  = \
   $(DIST)/bin/$(DLL_PREFIX)mozglue$(DLL_SUFFIX) \
   $(NULL)
 ifndef MOZ_NATIVE_NSPR
-ifeq ($(_MSC_VER),1600)
-JSSHELL_BINS += $(DIST)/bin/msvcr100.dll
-JSSHELL_BINS += $(DIST)/bin/msvcp100.dll
-endif
-ifeq ($(_MSC_VER),1700)
-JSSHELL_BINS += $(DIST)/bin/msvcr110.dll
-JSSHELL_BINS += $(DIST)/bin/msvcp110.dll
-endif
 ifeq ($(_MSC_VER),1800)
 JSSHELL_BINS += $(DIST)/bin/msvcr120.dll
 JSSHELL_BINS += $(DIST)/bin/msvcp120.dll
diff --git a/toolkit/xre/WindowsCrtPatch.h b/toolkit/xre/WindowsCrtPatch.h
index 0b6cd9fb9bc9..90f541cbbbad 100644
--- a/toolkit/xre/WindowsCrtPatch.h
+++ b/toolkit/xre/WindowsCrtPatch.h
@@ -127,11 +127,7 @@ Init()
   MOZ_ASSERT(!GetModuleHandleA("msvcr120.dll"));
   MOZ_ASSERT(!GetModuleHandleA("msvcr120d.dll"));
 
-  // Temporary until we fully switch over to VS 2013:
-  MOZ_ASSERT(!GetModuleHandleA("msvcr100.dll"));
-  MOZ_ASSERT(!GetModuleHandleA("msvcr100d.dll"));
-
-#if defined(_M_IX86) && defined(_MSC_VER) && _MSC_VER >= 1800
+#if defined(_M_IX86) && defined(_MSC_VER)
   if (!mozilla::IsXPSP3OrLater()) {
     NtdllIntercept.Init("ntdll.dll");
     NtdllIntercept.AddHook("RtlImageNtHeader",