From: Elvira Khabirova <lineprinter0@gmail.com>
Date: Mon, 3 Aug 2015 02:37:52 +0000 (+0300)
Subject: sysinfo.c: remove obsolete code
X-Git-Tag: v4.11~282
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a58e46d456576832acf233de50834ab0d7c7a5d;p=strace

sysinfo.c: remove obsolete code

struct sysinfo members totalhigh, freehigh and mem_unit are present
since Linux 2.3.48.

* configure.ac (AC_CHECK_MEMBERS): Remove struct sysinfo checks.
* sysinfo.c (sys_sysinfo): Remove HAVE_STRUCT_SYSINFO_* checks.
---

diff --git a/configure.ac b/configure.ac
index f66fb002..fbd20d21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -314,10 +314,6 @@ AC_CHECK_MEMBERS([struct sigevent._sigev_un._pad,
 		  siginfo_t.si_timerid,
 		  siginfo_t.si_overrun],,, [#include <signal.h>])
 
-AC_CHECK_MEMBERS([struct sysinfo.totalhigh,
-		  struct sysinfo.freehigh,
-		  struct sysinfo.mem_unit],,, [#include <sys/sysinfo.h>])
-
 AC_CHECK_TYPES([struct flock64],,, [#include <fcntl.h>])
 
 AC_CHECK_HEADERS([libaio.h], [
diff --git a/sysinfo.c b/sysinfo.c
index 0e724dad..4d9e30c6 100644
--- a/sysinfo.c
+++ b/sysinfo.c
@@ -18,15 +18,9 @@ SYS_FUNC(sysinfo)
 			", totalswap=%llu"
 			", freeswap=%llu"
 			", procs=%u"
-#ifdef HAVE_STRUCT_SYSINFO_TOTALHIGH
 			", totalhigh=%llu"
-#endif
-#ifdef HAVE_STRUCT_SYSINFO_FREEHIGH
 			", freehigh=%llu"
-#endif
-#ifdef HAVE_STRUCT_SYSINFO_MEM_UNIT
 			", mem_unit=%u"
-#endif
 			"}",
 			(unsigned long long) si.uptime
 			, (unsigned long long) si.loads[0]
@@ -39,15 +33,9 @@ SYS_FUNC(sysinfo)
 			, (unsigned long long) si.totalswap
 			, (unsigned long long) si.freeswap
 			, (unsigned) si.procs
-#ifdef HAVE_STRUCT_SYSINFO_TOTALHIGH
 			, (unsigned long long) si.totalhigh
-#endif
-#ifdef HAVE_STRUCT_SYSINFO_FREEHIGH
 			, (unsigned long long) si.freehigh
-#endif
-#ifdef HAVE_STRUCT_SYSINFO_MEM_UNIT
 			, si.mem_unit
-#endif
 			);
 	}