Bug 837345 - Cleanup unused code that is no longer needed with NSIS 2.46. r=bbondy

toolkit/mozapps/installer/windows/nsis/common.nsh

@@ -69,10 +69,9 @@
 !endif
 
 ; When including WinVer.nsh check if ___WINVER__NSH___ is defined to prevent
-; loading the file a second time. NSIS versions prior to 2.21 didn't include
-; WinVer.nsh so include it with the /NOFATAL option.
+; loading the file a second time.
 !ifndef ___WINVER__NSH___
-  !include /NONFATAL WinVer.nsh
+  !include WinVer.nsh
 !endif
 
 !include x64.nsh

toolkit/mozapps/installer/windows/nsis/overrides.nsh

@@ -8,6 +8,10 @@
 !ifndef OVERRIDES_INCLUDED
 !define OVERRIDES_INCLUDED
 
+!ifndef ___WINVER__NSH___
+!include WinVer.nsh
+!endif
+
 ; When including a file check if its verbose macro is defined to prevent
 ; loading the file a second time.
 !ifmacrondef TEXTFUNC_VERBOSE
@@ -24,16 +28,6 @@
   !insertmacro __WinVer_DefineOSTest Is ${WinVer} ""
 !macroend
 
-!ifndef WINVER_7
-  !define WINVER_7    0x06010000 ;6.01.????
-  !insertmacro __MOZ__WinVer_DefineOSTests 7
-!endif
- 
-!ifndef WINVER_2008R2
-  !define WINVER_2008R2    0x06010001 ;6.01.????
-  !insertmacro __MOZ__WinVer_DefineOSTests 2008R2
-!endif
-
 !ifndef WINVER_8
   !define WINVER_8    0x06020000 ;6.02.????
   !insertmacro __MOZ__WinVer_DefineOSTests 8
@@ -404,7 +398,6 @@
 ; that is distributed with NSIS v2.46-Unicode. This version has the calls to
 ; SetDetailsPrint commented out.
 ; See <NSIS v2.46-Unicode App Dir>/include/TextFunc.nsh for more information.
-
 !macro TextCompareNoDetailsCall _FILE1 _FILE2 _OPTION _FUNC
   !verbose push
   !verbose ${_OVERRIDE_VERBOSE}