diff options
author | Anders Broman <anders.broman@ericsson.com> | 2010-04-08 19:06:27 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2010-04-08 19:06:27 +0000 |
commit | 5b6b7c426227eae2f0f3f1b8e2a60ca162b3c091 (patch) | |
tree | 5f3121a20283e14b9e2da81160ed87c92be82313 /packaging | |
parent | bde67b60f563b8df1dfcb1c52c64a981e8e40b22 (diff) |
Revert incorrect change.
svn path=/trunk/; revision=32430
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/nsis/GetWindowsVersion.nsh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/packaging/nsis/GetWindowsVersion.nsh b/packaging/nsis/GetWindowsVersion.nsh index beecfd6f9f..49e9e95a63 100644 --- a/packaging/nsis/GetWindowsVersion.nsh +++ b/packaging/nsis/GetWindowsVersion.nsh @@ -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: |