diff --git a/common/src/Utilities/Linux/LnxMisc.cpp b/common/src/Utilities/Linux/LnxMisc.cpp index f09c5fe8a2..8078d43b85 100644 --- a/common/src/Utilities/Linux/LnxMisc.cpp +++ b/common/src/Utilities/Linux/LnxMisc.cpp @@ -48,6 +48,6 @@ wxString GetOSVersionString() // This shoul return a single comprehensive string description for the linux operating system: // Kernel version, distribution, etc. - return L"Linux Maybe?"; + return wxGetOsDescription(); } diff --git a/common/src/Utilities/Windows/WinMisc.cpp b/common/src/Utilities/Windows/WinMisc.cpp index e064ca355f..795b0cad7a 100644 --- a/common/src/Utilities/Windows/WinMisc.cpp +++ b/common/src/Utilities/Windows/WinMisc.cpp @@ -39,6 +39,11 @@ u64 GetCPUTicks() return count.QuadPart; } +// Windows SDK 7 provides this but previous ones do not, so roll our own in those cases: +#ifndef VER_SUITE_WH_SERVER +# define VER_SUITE_WH_SERVER 0x00008000 +#endif + typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO); typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);