diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-09-17 18:58:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-09-17 18:58:44 -0400 |
| commit | 50f981719f1bc7066496bcc4ef78fcdbb1ff1806 (patch) | |
| tree | 123794a410e5ef48d2e8633de40c458972dcb170 | |
| parent | cec42be570fcbbfbc5971e0ceba21e8eadd32d21 (diff) | |
| parent | ef35435584c529906d385b0ce532aa6e43205608 (diff) | |
| download | tor-50f981719f1bc7066496bcc4ef78fcdbb1ff1806.tar.gz tor-50f981719f1bc7066496bcc4ef78fcdbb1ff1806.zip | |
Merge branch 'maint-0.4.0' into maint-0.4.1
| -rw-r--r-- | changes/ticket31673 | 3 | ||||
| -rw-r--r-- | 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 0000000000..3b2bb4a46e --- /dev/null +++ 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 index f233188897..f4fa45167e 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 <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. */ |