Revert incorrect change.
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 8 Apr 2010 19:06:27 +0000 (19:06 +0000)
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 8 Apr 2010 19:06:27 +0000 (19:06 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32430 f5534014-38df-0310-8fa8-9805f1628bb7

packaging/nsis/GetWindowsVersion.nsh

index beecfd6f9f8da18e79ff551e24821a984935e733..49e9e95a634b5f495f7cb8a41fdd44ffc7595759 100644 (file)
@@ -62,8 +62,7 @@ Function GetWindowsVersion
   StrCmp $R1 '5.0' lbl_winnt_2000
   StrCmp $R1 '5.1' lbl_winnt_XP
   StrCmp $R1 '5.2' lbl_winnt_2003
-  StrCmp $R1 '6.0' lbl_winnt_vista
-  StrCmp $R1 '7.0' lbl_winnt_7 lbl_error
+  StrCmp $R1 '6.0' lbl_winnt_vista lbl_error
  
   lbl_winnt_x:
     StrCpy $R0 "NT $R0" 6
@@ -84,11 +83,7 @@ Function GetWindowsVersion
   lbl_winnt_vista:
     Strcpy $R0 'Vista'
   Goto lbl_done
-  lbl_winnt_7:
-    Strcpy $R0 'Windows 7'
-  Goto lbl_done
+  
   lbl_error:
     Strcpy $R0 ''
   lbl_done: