diff options
author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-07-21 19:07:50 -0700 |
---|---|---|
committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-07-21 19:07:50 -0700 |
commit | faf864b8a27d94e5db62b37eb98757ad621e1711 (patch) | |
tree | d3ae465ef645310145d63a4841847cf091c5d8a8 /osdep | |
parent | 10564d8e14caad915886ede59a54bcfc0c620f0b (diff) | |
parent | 8a23d764de82b7902d42f05ca1130847bbfe04af (diff) | |
download | infinitytier-faf864b8a27d94e5db62b37eb98757ad621e1711.tar.gz infinitytier-faf864b8a27d94e5db62b37eb98757ad621e1711.zip |
Merge branch 'master' into dev
Diffstat (limited to 'osdep')
-rw-r--r-- | osdep/BSDEthernetTap.cpp | 1 | ||||
-rw-r--r-- | osdep/ManagedRoute.cpp | 1 | ||||
-rw-r--r-- | osdep/OSXEthernetTap.cpp | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/osdep/BSDEthernetTap.cpp b/osdep/BSDEthernetTap.cpp index 3e0c2264..e8d36c9c 100644 --- a/osdep/BSDEthernetTap.cpp +++ b/osdep/BSDEthernetTap.cpp @@ -34,7 +34,6 @@ #include <sys/cdefs.h> #include <sys/uio.h> #include <sys/param.h> -#include <sys/sysctl.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/osdep/ManagedRoute.cpp b/osdep/ManagedRoute.cpp index ae2f8943..264866fc 100644 --- a/osdep/ManagedRoute.cpp +++ b/osdep/ManagedRoute.cpp @@ -33,7 +33,6 @@ #ifdef __UNIX_LIKE__ #include <unistd.h> #include <sys/param.h> -#include <sys/sysctl.h> #include <sys/socket.h> #include <sys/types.h> #include <sys/wait.h> diff --git a/osdep/OSXEthernetTap.cpp b/osdep/OSXEthernetTap.cpp index 56934c96..e5361ce4 100644 --- a/osdep/OSXEthernetTap.cpp +++ b/osdep/OSXEthernetTap.cpp @@ -34,7 +34,6 @@ #include <sys/cdefs.h> #include <sys/uio.h> #include <sys/param.h> -#include <sys/sysctl.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <netinet/in.h> |