Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-11-04 08:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'master' of https://github.com/PurpleI2P/i2pd

Browse source
This commit is contained in:
EinMByte 2015-09-05 11:41:03 +02:00
commit c42d76bca7
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/CMakeLists.txt
View file

@ -21,6 +21,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
list(APPEND CLIENT_SRC "DaemonLinux.cpp") list(APPEND CLIENT_SRC "DaemonLinux.cpp")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
list(APPEND CLIENT_SRC "DaemonLinux.cpp") list(APPEND CLIENT_SRC "DaemonLinux.cpp")
elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
list(APPEND CLIENT_SRC "DaemonLinux.cpp")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
list(APPEND CLIENT_SRC "DaemonWin32.cpp") list(APPEND CLIENT_SRC "DaemonWin32.cpp")
list(APPEND CLIENT_SRC "Win32Service.cpp") list(APPEND CLIENT_SRC "Win32Service.cpp")

2
core/util/I2PEndian.h
View file

@ -3,7 +3,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <string.h> #include <string.h>
#if defined(__linux__) || defined(__FreeBSD_kernel__) #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
#include <endian.h> #include <endian.h>
#elif __FreeBSD__ #elif __FreeBSD__
#include <sys/endian.h> #include <sys/endian.h>

6
core/util/util.cpp
View file

@ -15,7 +15,7 @@
#include "util.h" #include "util.h"
#include "Log.h" #include "Log.h"
#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__OpenBSD__)
#include <sys/types.h> #include <sys/types.h>
#include <ifaddrs.h> #include <ifaddrs.h>
#elif defined(WIN32) #elif defined(WIN32)
@ -463,7 +463,7 @@ namespace http
namespace net { namespace net {
#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__OpenBSD__)
int GetMTUUnix(const boost::asio::ip::address& localAddress, int fallback) int GetMTUUnix(const boost::asio::ip::address& localAddress, int fallback)
{ {
@ -663,7 +663,7 @@ namespace net {
{ {
const int fallback = 576; // fallback MTU const int fallback = 576; // fallback MTU
#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__OpenBSD__)
return GetMTUUnix(localAddress, fallback); return GetMTUUnix(localAddress, fallback);
#elif defined(WIN32) #elif defined(WIN32)
return GetMTUWindows(localAddress, fallback); return GetMTUWindows(localAddress, fallback);