nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tor-github/pr/1307'

Browse Source
This commit is contained in:
George Kadianakis 2019-09-11 16:19:21 +03:00
commit 3b32f2508c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket31673 Normal file
View File

@ -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;

7
src/lib/meminfo/meminfo.c
View File

@ -18,9 +18,6 @@
#include "lib/log/log.h" #include "lib/log/log.h"
#include "lib/malloc/malloc.h" #include "lib/malloc/malloc.h"
#ifdef HAVE_SYS_SYSCTL_H
#include <sys/sysctl.h>
#endif
#ifdef HAVE_FCNTL_H #ifdef HAVE_FCNTL_H
#include <fcntl.h> #include <fcntl.h>
#endif #endif
@ -36,6 +33,10 @@
#endif #endif
#include <string.h> #include <string.h>
#if defined(HAVE_SYS_SYSCTL_H) && !defined(_WIN32) && !defined(__linux__)
#include <sys/sysctl.h>
#endif
DISABLE_GCC_WARNING(aggregate-return) DISABLE_GCC_WARNING(aggregate-return)
/** Call the platform malloc info function, and dump the results to the log at /** 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. */ * level <b>severity</b>. If no such function exists, do nothing. */