tor

commit 50f981719f1bc7066496bcc4ef78fcdbb1ff1806
parent cec42be570fcbbfbc5971e0ceba21e8eadd32d21
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 17 Sep 2019 18:58:44 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

Diffstat:
A
changes/ticket31673
 | 
3
+++
M
src/lib/meminfo/meminfo.c
 | 
7
++++---

2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/changes/ticket31673 b/changes/ticket31673
@@ -0,0 +1,3 @@
+  o New system requirements (build system):
+    - Do not include the deprecated <sys/sysctl.h> on Linux or Windows system.
+      Closes 31673;
diff --git 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 <sys/sysctl.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
@@ -36,6 +33,10 @@
 #endif
 #include <string.h>
 
+#if defined(HAVE_SYS_SYSCTL_H) && !defined(_WIN32) && !defined(__linux__)
+#include <sys/sysctl.h>
+#endif
+
 DISABLE_GCC_WARNING(aggregate-return)
 /** Call the platform malloc info function, and dump the results to the log at
  * level <b>severity</b>.  If no such function exists, do nothing. */