diff options
| -rw-r--r-- | changes/windows_8 | 5 | ||||
| -rw-r--r-- | src/common/compat.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/windows_8 b/changes/windows_8 new file mode 100644 index 000000000..405e4fa15 --- /dev/null +++ b/changes/windows_8 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - The next version of Windows will be called Windows 8, and it has a major + version of 6, minor version of 2. Correctly identify that version instead + of calling it "Very recent version". Fixes bug 4153; reported by funkstar. + diff --git a/src/common/compat.c b/src/common/compat.c index 330c43228..2cf7f463c 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1861,6 +1861,7 @@ get_uname(void) static struct { unsigned major; unsigned minor; const char *version; } win_version_table[] = { + { 6, 2, "Windows 8" }, { 6, 1, "Windows 7" }, { 6, 0, "Windows Vista" }, { 5, 2, "Windows Server 2003" }, @@ -1917,7 +1918,7 @@ get_uname(void) plat, extra); } else { if (info.dwMajorVersion > 6 || - (info.dwMajorVersion==6 && info.dwMinorVersion>1)) + (info.dwMajorVersion==6 && info.dwMinorVersion>2)) tor_snprintf(uname_result, sizeof(uname_result), "Very recent version of Windows [major=%d,minor=%d] %s", (int)info.dwMajorVersion,(int)info.dwMinorVersion, |