Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2013-08-13 17:17:40 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2013-08-13 17:40:43 (GMT) |
| commit | 437e70ff9d254b11a30a4926010a91543d7f282c (patch) | |
| tree | 123ef9476d89ad32643356ea11c52d212d2d03ad /3rdParty/Boost | |
| parent | 3eefe28a2f6cc1e33d9d2b0bad7f9c6f2146352f (diff) | |
| download | swift-437e70ff9d254b11a30a4926010a91543d7f282c.zip swift-437e70ff9d254b11a30a4926010a91543d7f282c.tar.bz2 | |
Adding basic support for Android and Unbound (No IPv6 yet).
Change-Id: I1d74324515b20e0dc3d0ef4aa2f556fea7b4bee3
License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.s
Diffstat (limited to '3rdParty/Boost')
| -rw-r--r-- | 3rdParty/Boost/02_android_compilation_fixes.diff | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/3rdParty/Boost/02_android_compilation_fixes.diff b/3rdParty/Boost/02_android_compilation_fixes.diff new file mode 100644 index 0000000..9aba7e1 --- /dev/null +++ b/3rdParty/Boost/02_android_compilation_fixes.diff @@ -0,0 +1,36 @@ +diff --git a/3rdParty/Boost/src/boost/detail/endian.hpp b/3rdParty/Boost/src/boost/detail/endian.hpp +index 98c870c..ac77a2e 100644 +--- a/3rdParty/Boost/src/boost/detail/endian.hpp ++++ b/3rdParty/Boost/src/boost/detail/endian.hpp +@@ -66,8 +66,8 @@ + || defined(_M_ALPHA) || defined(__amd64) \ + || defined(__amd64__) || defined(_M_AMD64) \ + || defined(__x86_64) || defined(__x86_64__) \ +- || defined(_M_X64) || defined(__bfin__) +- ++ || defined(_M_X64) || defined(__bfin__) \ ++ || defined(ANDROID) + # define BOOST_LITTLE_ENDIAN + # define BOOST_BYTE_ORDER 1234 + #else +diff --git a/3rdParty/Boost/src/libs/filesystem/src/operations.cpp b/3rdParty/Boost/src/libs/filesystem/src/operations.cpp +index 16a336f..d066e40 100644 +--- a/3rdParty/Boost/src/libs/filesystem/src/operations.cpp ++++ b/3rdParty/Boost/src/libs/filesystem/src/operations.cpp +@@ -73,10 +73,14 @@ using std::wstring; + const fs::path dot_dot_path(".."); + # include <sys/types.h> + # include <sys/stat.h> +-# if !defined(__APPLE__) && !defined(__OpenBSD__) ++# if !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(ANDROID) + # include <sys/statvfs.h> + # define BOOST_STATVFS statvfs + # define BOOST_STATVFS_F_FRSIZE vfs.f_frsize ++# elif defined (ANDROID) ++# include <sys/vfs.h> ++# define BOOST_STATVFS statfs ++# define BOOST_STATVFS_F_FRSIZE static_cast<boost::uintmax_t>(vfs.f_bsize) + # else + # ifdef __OpenBSD__ + # include <sys/param.h> + --
\ No newline at end of file |