From acecc97cbe1feead8c437b2fd49b80065d7cbe41 Mon Sep 17 00:00:00 2001 From: Jack Lloyd Date: Fri, 9 Mar 2018 17:48:31 -0500 Subject: Fix header for getentropy on macOS Re #1481 --- src/lib/entropy/getentropy/getentropy.cpp | 6 +++++- src/scripts/ci_build.py | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib/entropy/getentropy/getentropy.cpp b/src/lib/entropy/getentropy/getentropy.cpp index e578a4ed5..15bd8abe8 100644 --- a/src/lib/entropy/getentropy/getentropy.cpp +++ b/src/lib/entropy/getentropy/getentropy.cpp @@ -7,7 +7,11 @@ #include -#include +#if defined(BOTAN_TARGET_OS_IS_DARWIN) + #include +#else + #include +#endif namespace Botan { diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py index dfb65d629..5560ced51 100755 --- a/src/scripts/ci_build.py +++ b/src/scripts/ci_build.py @@ -170,6 +170,8 @@ def determine_flags(target, target_os, target_cpu, target_cc, cc_bin, ccache, ro if target_os == 'osx': # Test Boost on OS X flags += ['--with-boost'] + # Travis has 10.12 as default image + flags += ['--with-os-features=getentropy'] elif target_os == 'linux': flags += ['--with-lzma'] -- cgit v1.2.3