From bdc6cfb60a41111cf65d46f76ee179a9887c2d4c Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 10 May 2008 16:00:14 +0000 Subject: adaptions for openbsd 4.3 --- src/anytun.cpp | 2 +- src/ovpn/tunDevice.cpp | 6 +++--- src/ovpn/tunDevice.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/anytun.cpp b/src/anytun.cpp index 004330b..7b03785 100644 --- a/src/anytun.cpp +++ b/src/anytun.cpp @@ -183,7 +183,7 @@ void* sender(void* p) { param->src.send(encrypted_packet.getBuf(), encrypted_packet.getLength(), conn.remote_host_, conn.remote_port_); } - catch (Exception e) + catch (std::exception e) { } } diff --git a/src/ovpn/tunDevice.cpp b/src/ovpn/tunDevice.cpp index 032af29..822b6a7 100644 --- a/src/ovpn/tunDevice.cpp +++ b/src/ovpn/tunDevice.cpp @@ -31,15 +31,15 @@ #include #include +#include "tunDevice.h" +#include "threadUtils.hpp" + extern "C" { #include "openvpn/config.h" #include "openvpn/syshead.h" #include "openvpn/tun.h" } -#include "tunDevice.h" -#include "threadUtils.hpp" - TunDevice::TunDevice(const char* dev_name,const char* dev_type, const char* ifcfg_lp, const char* ifcfg_rnmp) { diff --git a/src/ovpn/tunDevice.h b/src/ovpn/tunDevice.h index 5886b7d..b0c5780 100644 --- a/src/ovpn/tunDevice.h +++ b/src/ovpn/tunDevice.h @@ -32,8 +32,8 @@ #define _TUNDEVICE_H_ #include "buffer.h" -#include "deviceConfig.hpp" #include "threadUtils.hpp" +#include "deviceConfig.hpp" class TunDevice { -- cgit v1.2.3