Skip to content

Remove including sys/sysctl.h for Linux #6145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bryancall merged 1 commit into from
Nov 6, 2019
Merged

Remove including sys/sysctl.h for Linux #6145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/tscore/ink_platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,11 @@ typedef unsigned int in_addr_t;
#include <sys/sysinfo.h>
#endif

#if defined(darwin) || defined(freebsd)
#ifdef HAVE_SYS_SYSCTL_H
#include <sys/sysctl.h>
#endif
#endif

#ifdef HAVE_SYS_SYSTEMINFO_H
#include <sys/systeminfo.h>
Expand Down
2 changes: 2 additions & 0 deletions src/tscore/ink_hrtime.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@
#if defined(freebsd)
#include <sys/types.h>
#include <sys/param.h>
#ifdef HAVE_SYS_SYSCTL_H
#include <sys/sysctl.h>
#endif
#endif
#include <cstring>
#include <sys/time.h>

Expand Down
4 changes: 4 additions & 0 deletions tests/include/catch.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7093,7 +7093,11 @@ namespace Catch {
# include <stdbool.h>
# include <sys/types.h>
# include <unistd.h>
#if defined(darwin) || defined(freebsd)
#ifdef HAVE_SYS_SYSCTL_H
# include <sys/sysctl.h>
#endif
#endif
# include <cstddef>
# include <ostream>

Expand Down