mirror of
https://github.com/reactos/CMake.git
synced 2024-12-05 02:06:34 +00:00
KWSys 2014-09-25 (29ffaf43)
Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 29ffaf43 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' fb77be5a..29ffaf43 Brad King (1): 29ffaf43 Suppress deprecation warnings for GetVersionEx Sean McBride (1): 6aa1f800 SystemInformation: Fix clang -Wtautological-pointer-compare warning Change-Id: I29f3dcf2a32e1b80bade233987eb091038aace65
This commit is contained in:
parent
92b582a67e
commit
a79ff0e4ed
@ -36,6 +36,9 @@ a UNIX-style select system call.
|
||||
#pragma warning (push, 1)
|
||||
#endif
|
||||
#include <windows.h> /* Windows API */
|
||||
#if defined(_MSC_VER) && _MSC_VER >= 1800
|
||||
# define KWSYS_WINDOWS_DEPRECATED_GetVersionEx
|
||||
#endif
|
||||
#include <string.h> /* strlen, strdup */
|
||||
#include <stdio.h> /* sprintf */
|
||||
#include <io.h> /* _unlink */
|
||||
@ -335,7 +338,14 @@ kwsysProcess* kwsysProcess_New(void)
|
||||
windows. */
|
||||
ZeroMemory(&osv, sizeof(osv));
|
||||
osv.dwOSVersionInfoSize = sizeof(osv);
|
||||
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
|
||||
# pragma warning (push)
|
||||
# pragma warning (disable:4996)
|
||||
#endif
|
||||
GetVersionEx(&osv);
|
||||
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
|
||||
# pragma warning (pop)
|
||||
#endif
|
||||
if(osv.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
|
||||
{
|
||||
/* Win9x no longer supported. */
|
||||
@ -2370,7 +2380,14 @@ static kwsysProcess_List* kwsysProcess_List_New(void)
|
||||
/* Select an implementation. */
|
||||
ZeroMemory(&osv, sizeof(osv));
|
||||
osv.dwOSVersionInfoSize = sizeof(osv);
|
||||
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
|
||||
# pragma warning (push)
|
||||
# pragma warning (disable:4996)
|
||||
#endif
|
||||
GetVersionEx(&osv);
|
||||
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
|
||||
# pragma warning (pop)
|
||||
#endif
|
||||
self->NT4 = (osv.dwPlatformId == VER_PLATFORM_WIN32_NT &&
|
||||
osv.dwMajorVersion < 5)? 1:0;
|
||||
|
||||
|
@ -60,6 +60,9 @@
|
||||
|
||||
#if defined(_WIN32)
|
||||
# include <windows.h>
|
||||
# if defined(_MSC_VER) && _MSC_VER >= 1800
|
||||
# define KWSYS_WINDOWS_DEPRECATED_GetVersionEx
|
||||
# endif
|
||||
# include <errno.h>
|
||||
# if defined(KWSYS_SYS_HAS_PSAPI)
|
||||
# include <psapi.h>
|
||||
@ -3786,7 +3789,7 @@ bool SystemInformationImplementation::QueryLinuxMemory()
|
||||
return false;
|
||||
}
|
||||
|
||||
if( unameInfo.release!=0 && strlen(unameInfo.release)>=3 )
|
||||
if( strlen(unameInfo.release)>=3 )
|
||||
{
|
||||
// release looks like "2.6.3-15mdk-i686-up-4GB"
|
||||
char majorChar=unameInfo.release[0];
|
||||
@ -5063,6 +5066,10 @@ bool SystemInformationImplementation::QueryOSInformation()
|
||||
// Try calling GetVersionEx using the OSVERSIONINFOEX structure.
|
||||
ZeroMemory (&osvi, sizeof (OSVERSIONINFOEXW));
|
||||
osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEXW);
|
||||
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
|
||||
# pragma warning (push)
|
||||
# pragma warning (disable:4996)
|
||||
#endif
|
||||
bOsVersionInfoEx = GetVersionExW ((OSVERSIONINFOW*)&osvi);
|
||||
if (!bOsVersionInfoEx)
|
||||
{
|
||||
@ -5072,6 +5079,9 @@ bool SystemInformationImplementation::QueryOSInformation()
|
||||
return false;
|
||||
}
|
||||
}
|
||||
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
|
||||
# pragma warning (pop)
|
||||
#endif
|
||||
|
||||
switch (osvi.dwPlatformId)
|
||||
{
|
||||
|
@ -82,6 +82,9 @@
|
||||
# ifndef INVALID_FILE_ATTRIBUTES
|
||||
# define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
|
||||
# endif
|
||||
# if defined(_MSC_VER) && _MSC_VER >= 1800
|
||||
# define KWSYS_WINDOWS_DEPRECATED_GetVersionEx
|
||||
# endif
|
||||
#elif defined (__CYGWIN__)
|
||||
# include <windows.h>
|
||||
# undef _WIN32
|
||||
@ -4629,6 +4632,10 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
|
||||
ZeroMemory(&osvi, sizeof(OSVERSIONINFOEXA));
|
||||
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA);
|
||||
|
||||
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
|
||||
# pragma warning (push)
|
||||
# pragma warning (disable:4996)
|
||||
#endif
|
||||
bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO *)&osvi);
|
||||
if (!bOsVersionInfoEx)
|
||||
{
|
||||
@ -4638,6 +4645,9 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
|
||||
# pragma warning (pop)
|
||||
#endif
|
||||
|
||||
switch (osvi.dwPlatformId)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user