From 25474b4c2dca3babaaa078fbef2544f6f0c1b9f0 Mon Sep 17 00:00:00 2001
From: Jack Lloyd <jack@randombit.net>
Date: Tue, 17 Jan 2017 10:56:13 -0500
Subject: Fixes for OS X build

os_utils.h was missing an include, only noticed on OS X

sigemptyset is a macro on OS X so cannot be called as ::sigemptyset
---
 src/lib/utils/os_utils.cpp | 2 +-
 src/lib/utils/os_utils.h   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/utils/os_utils.cpp b/src/lib/utils/os_utils.cpp
index 233a3991c..4dac4f9af 100644
--- a/src/lib/utils/os_utils.cpp
+++ b/src/lib/utils/os_utils.cpp
@@ -320,7 +320,7 @@ int run_cpu_instruction_probe(std::function<int ()> probe_fn)
    struct sigaction sigaction;
 
    sigaction.sa_handler = botan_sigill_handler;
-   ::sigemptyset(&sigaction.sa_mask);
+   sigemptyset(&sigaction.sa_mask);
    sigaction.sa_flags = 0;
 
    int rc = ::sigaction(SIGILL, &sigaction, &old_sigaction);
diff --git a/src/lib/utils/os_utils.h b/src/lib/utils/os_utils.h
index b06a72265..b74debc46 100644
--- a/src/lib/utils/os_utils.h
+++ b/src/lib/utils/os_utils.h
@@ -9,6 +9,7 @@
 #define BOTAN_OS_UTILS_H__
 
 #include <botan/types.h>
+#include <functional>
 
 namespace Botan {
 
-- 
cgit v1.2.3