commit 409df19b5a0053175f05851086e6ef35c5bce2c0
Author: David Goulet
Date: Mon Sep 9 11:55:33 2019 -0400
build: The is now deprecated on Linux
Closes #31673
---
changes/ticket31673 | 3 +++
src/lib/meminfo/meminfo.c | 7 ---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/changes/ticket31673 b/changes/ticket31673
new file mode 100644
index 0..3b2bb4a46
--- /dev/null
+++ b/changes/ticket31673
@@ -0,0 +1,3 @@
+ o New system requirements (build system):
+- Do not include the deprecated on Linux or Windows system.
+ Closes 31673;
diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c
index f23318889..f4fa45167 100644
--- a/src/lib/meminfo/meminfo.c
+++ b/src/lib/meminfo/meminfo.c
@@ -18,9 +18,6 @@
#include "lib/log/log.h"
#include "lib/malloc/malloc.h"
-#ifdef HAVE_SYS_SYSCTL_H
-#include
-#endif
#ifdef HAVE_FCNTL_H
#include
#endif
@@ -36,6 +33,10 @@
#endif
#include
+#if defined(HAVE_SYS_SYSCTL_H) && !defined(_WIN32) && !defined(__linux__)
+#include
+#endif
+
DISABLE_GCC_WARNING(aggregate-return)
/** Call the platform malloc info function, and dump the results to the log at
* level severity. If no such function exists, do nothing. */
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
