diff options
author | Jack Lloyd <[email protected]> | 2015-12-11 10:30:48 -0500 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2015-12-11 10:30:48 -0500 |
commit | ea46993ee082d69b03e85ef4135d46316c75fe44 (patch) | |
tree | b9fa4b333a9dace6a8f5f1f70eb932f05440c7c1 /src/lib | |
parent | 7db6e85d2af49d7d5220b99f7e77e60f4ab35de1 (diff) |
Disable asio serial port support to avoid Darwin braindamage. GH #350
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/utils/http_util/http_util.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/utils/http_util/http_util.cpp b/src/lib/utils/http_util/http_util.cpp index c437d0148..1f67c0b4b 100644 --- a/src/lib/utils/http_util/http_util.cpp +++ b/src/lib/utils/http_util/http_util.cpp @@ -12,7 +12,15 @@ #include <sstream> #if defined(BOTAN_HAS_BOOST_ASIO) -#include <boost/asio.hpp> + + /* + * We don't need serial port support anyway, and asking for it + * causes macro conflicts with Darwin's termios.h when this + * file is included in the amalgamation. GH #350 + */ + #define BOOST_ASIO_DISABLE_SERIAL_PORT + #include <boost/asio.hpp> + #endif namespace Botan { |