commit 103c861dfead6640a4bef6e85f740f7c635c7343 Author: Sebastian Hahn <sebastian@torproject.org> Date: Sat Oct 1 14:44:39 2011 +0200 Looks like Windows version 6.2 will be Windows 8 Thanks to funkstar for the report --- changes/windows_8 | 5 +++++ 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 0000000..405e4fa --- /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 80b4907..266fc61 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1806,6 +1806,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" }, @@ -1862,7 +1863,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,