mirror of
https://git.tukaani.org/xz.git
synced 2024-04-04 12:36:23 +02:00
tuklib_physmem: Comment out support for Windows versions older than 2000.
This commit is contained in:
parent
7d73d1f0e0
commit
e582f8e0fe
1 changed files with 9 additions and 11 deletions
|
@ -73,23 +73,20 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// With GCC >= 8.1 with -Wextra and Clang >= 13 with -Wcast-function-type
|
|
||||||
// will warn about the Windows-specific code.
|
|
||||||
#if defined(__has_warning)
|
|
||||||
# if __has_warning("-Wcast-function-type")
|
|
||||||
# define CAN_DISABLE_WCAST_FUNCTION_TYPE 1
|
|
||||||
# endif
|
|
||||||
#elif TUKLIB_GNUC_REQ(8,1)
|
|
||||||
# define CAN_DISABLE_WCAST_FUNCTION_TYPE 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
extern uint64_t
|
extern uint64_t
|
||||||
tuklib_physmem(void)
|
tuklib_physmem(void)
|
||||||
{
|
{
|
||||||
uint64_t ret = 0;
|
uint64_t ret = 0;
|
||||||
|
|
||||||
#if defined(_WIN32) || defined(__CYGWIN__)
|
#if defined(_WIN32) || defined(__CYGWIN__)
|
||||||
|
// This requires Windows 2000 or later.
|
||||||
|
MEMORYSTATUSEX meminfo;
|
||||||
|
meminfo.dwLength = sizeof(meminfo);
|
||||||
|
if (GlobalMemoryStatusEx(&meminfo))
|
||||||
|
ret = meminfo.ullTotalPhys;
|
||||||
|
|
||||||
|
/*
|
||||||
|
// Old version that is compatible with even Win95:
|
||||||
if ((GetVersion() & 0xFF) >= 5) {
|
if ((GetVersion() & 0xFF) >= 5) {
|
||||||
// Windows 2000 and later have GlobalMemoryStatusEx() which
|
// Windows 2000 and later have GlobalMemoryStatusEx() which
|
||||||
// supports reporting values greater than 4 GiB. To keep the
|
// supports reporting values greater than 4 GiB. To keep the
|
||||||
|
@ -125,6 +122,7 @@ tuklib_physmem(void)
|
||||||
GlobalMemoryStatus(&meminfo);
|
GlobalMemoryStatus(&meminfo);
|
||||||
ret = meminfo.dwTotalPhys;
|
ret = meminfo.dwTotalPhys;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
#elif defined(__OS2__)
|
#elif defined(__OS2__)
|
||||||
unsigned long mem;
|
unsigned long mem;
|
||||||
|
|
Loading…
Reference in a new issue