diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-10-03 15:19:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-10-03 15:19:00 -0400 |
| commit | 2725a88d5e3ec362a4f866f53c26ca20f943eb49 (patch) | |
| tree | 90151d23191a50c821c31d7b808217bfe561bfce /src/common | |
| parent | 05f672c8c21ceb4c47731fb3d8f777bf95583b3b (diff) | |
| parent | 103c861dfead6640a4bef6e85f740f7c635c7343 (diff) | |
| download | tor-2725a88d5e3ec362a4f866f53c26ca20f943eb49.tar.gz tor-2725a88d5e3ec362a4f866f53c26ca20f943eb49.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/compat.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index 330c432284..2cf7f463c1 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, |