mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Merge branch 'maint-0.2.9' into release-0.2.9
This commit is contained in:
@@ -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;
|
||||
+5
-3
@@ -27,9 +27,6 @@
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#ifdef HAVE_SYS_SYSCTL_H
|
||||
#include <sys/sysctl.h>
|
||||
#endif
|
||||
#ifdef HAVE_SYS_STAT_H
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
@@ -70,6 +67,11 @@
|
||||
#include <sys/capability.h>
|
||||
#endif
|
||||
|
||||
/* Now deprecated in Linux GLIBC */
|
||||
#if defined(HAVE_SYS_SYSCTL_H) && !defined(_WIN32) && !defined(__linux__)
|
||||
#include <sys/sysctl.h>
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <conio.h>
|
||||
#include <wchar.h>
|
||||
|
||||
Reference in New Issue
Block a user