nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Win32 compilation/correctness fixes.

Browse Source 
svn:r5218
This commit is contained in:
Nick Mathewson 2005-10-07 19:33:47 +00:00
parent 83e119154b
commit 010bcfa9df
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/compat.c
View File

@ -711,7 +711,7 @@ get_uname(void)
{ -1, -1, NULL } { -1, -1, NULL }
}; };
info.dwOSVersionInfoSize = sizeof(info); info.dwOSVersionInfoSize = sizeof(info);
GetVersionEx(&info); GetVersionEx((LPOSVERSIONINFO)&info);
if (info.dwMajorVersion == 4 && info.dwMinorVersion == 0) { if (info.dwMajorVersion == 4 && info.dwMinorVersion == 0) {
if (info.dwPlatformId == VER_PLATFORM_WIN32_NT) if (info.dwPlatformId == VER_PLATFORM_WIN32_NT)
plat = "Windows NT 4.0"; plat = "Windows NT 4.0";
@ -727,7 +727,7 @@ get_uname(void)
} }
} }
if (plat) { if (plat) {
tor_snprtint(uname_result, sizeof(uname_result), "%s %s", tor_snprintf(uname_result, sizeof(uname_result), "%s %s",
plat, info.szCSDVersion); plat, info.szCSDVersion);
} else { } else {
if (info.dwMajorVersion > 6 || if (info.dwMajorVersion > 6 ||
@ -740,26 +740,26 @@ get_uname(void)
"Unrecognized version of Windows [major=%d,minor=%d]", "Unrecognized version of Windows [major=%d,minor=%d]",
(int)info.dwMajorVersion,(int)info.dwMinorVersion); (int)info.dwMajorVersion,(int)info.dwMinorVersion);
} }
if (info.dwProductType == VER_NT_DOMAIN_CONTROLLER) { if (info.wProductType == VER_NT_DOMAIN_CONTROLLER) {
strlcat(uname_result, " [domain controller]", sizeof(uname_result)); strlcat(uname_result, " [domain controller]", sizeof(uname_result));
} else if (info.dwProductType == VER_NT_SERVER) { } else if (info.wProductType == VER_NT_SERVER) {
strlcat(uname_result, " [server]", sizeof(uname_result)); strlcat(uname_result, " [server]", sizeof(uname_result));
} else if (info.dwProductType == VER_NT_WORKSTATION) { } else if (info.wProductType == VER_NT_WORKSTATION) {
strlcat(uname_result, " [workstation]", sizeof(uname_result)); strlcat(uname_result, " [workstation]", sizeof(uname_result));
} }
if (info.dwSuiteMask & VER_SUITE_DATACENTER) { if (info.wSuiteMask & VER_SUITE_DATACENTER) {
strlcat(uname_result, " {datacenter}", sizeof(uname_result)); strlcat(uname_result, " {datacenter}", sizeof(uname_result));
} }
if (info.dwSuiteMask & VER_SUITE_ENTERPRISE) { if (info.wSuiteMask & VER_SUITE_ENTERPRISE) {
strlcat(uname_result, " {enterprise}", sizeof(uname_result)); strlcat(uname_result, " {enterprise}", sizeof(uname_result));
} }
if (info.dwSuiteMask & VER_SUITE_PERSONAL) { if (info.wSuiteMask & VER_SUITE_PERSONAL) {
strlcat(uname_result, " {personal}", sizeof(uname_result)); strlcat(uname_result, " {personal}", sizeof(uname_result));
} }
if (info.dwSuiteMask & VER_SUITE_EMBEDDED) { if (info.wSuiteMask & VER_SUITE_EMBEDDEDNT) {
strlcat(uname_result, " {personal}", sizeof(uname_result)); strlcat(uname_result, " {personal}", sizeof(uname_result));
} }
if (info.dwSuiteMask & VER_SUITE_PERSONAL) { if (info.wSuiteMask & VER_SUITE_PERSONAL) {
strlcat(uname_result, " {personal}", sizeof(uname_result)); strlcat(uname_result, " {personal}", sizeof(uname_result));
} }
#else #else

3
src/win32/orconfig.h
View File

@ -125,6 +125,9 @@
/* Define to 1 if you have the <sys/types.h> header file. */ /* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H #define HAVE_SYS_TYPES_H
/* Define to 1 if you have the <sys/utime.h> header file. */
#define HAVE_SYS_UTIME_H
/* Define to 1 if you have the <sys/wait.h> header file. */ /* Define to 1 if you have the <sys/wait.h> header file. */
#undef HAVE_SYS_WAIT_H #undef HAVE_SYS_WAIT_H