Sebastian Lackner : configure: Explicitly check for sysinfo function.
Alexandre Julliard
julliard at winehq.org
Thu Aug 11 09:37:48 CDT 2016
Module: wine
Branch: master
Commit: 9815806f16441004b87b11e3c0bbc190e9011044
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9815806f16441004b87b11e3c0bbc190e9011044
Author: Sebastian Lackner <sebastian at fds-team.de>
Date: Thu Aug 11 08:34:21 2016 +0200
configure: Explicitly check for sysinfo function.
Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure | 1 +
configure.ac | 1 +
dlls/ntdll/virtual.c | 4 ++--
include/config.h.in | 3 +++
4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index b8eedc5..bf4d1a7 100755
--- a/configure
+++ b/configure
@@ -15133,6 +15133,7 @@ for ac_func in \
strtoll \
strtoull \
symlink \
+ sysinfo \
tcdrain \
thr_kill2 \
timegm \
diff --git a/configure.ac b/configure.ac
index f5dde04..0fad32f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2039,6 +2039,7 @@ AC_CHECK_FUNCS(\
strtoll \
strtoull \
symlink \
+ sysinfo \
tcdrain \
thr_kill2 \
timegm \
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index 1312c8b..e826fa0 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -1359,7 +1359,7 @@ void virtual_init_threading(void)
*/
void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info )
{
-#ifdef HAVE_SYS_SYSINFO_H
+#ifdef HAVE_SYSINFO
struct sysinfo sinfo;
#endif
@@ -1368,7 +1368,7 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info )
info->PageSize = page_size;
info->MmLowestPhysicalPage = 1;
info->MmHighestPhysicalPage = 0x7fffffff / page_size;
-#ifdef HAVE_SYS_SYSINFO_H
+#ifdef HAVE_SYSINFO
if (!sysinfo(&sinfo))
{
ULONG64 total = (ULONG64)sinfo.totalram * sinfo.mem_unit;
diff --git a/include/config.h.in b/include/config.h.in
index 64f56fd..6acafca 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -1008,6 +1008,9 @@
/* Define to 1 if you have the <syscall.h> header file. */
#undef HAVE_SYSCALL_H
+/* Define to 1 if you have the `sysinfo' function. */
+#undef HAVE_SYSINFO
+
/* Define to 1 if you have the <sys/asoundlib.h> header file. */
#undef HAVE_SYS_ASOUNDLIB_H
More information about the wine-cvs
mailing list