Fix Cygwin compile due to missing <signal.h>

StrataSource · Oct 2, 2016 · e09d8a2 · e09d8a2
1 parent 856d3d5
commit e09d8a2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/config.compat b/config.compat
@@ -690,6 +690,10 @@ NAMESPACE_END
 #	define THREADS_AVAILABLE
 #endif
 
+#if defined(CRYPTOPP_BSD_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE) || defined(__CYGWIN__)
+# define UNIX_SIGNALS_AVAILABLE 1
+#endif
+
 #ifdef CRYPTOPP_WIN32_AVAILABLE
 # if !defined(WINAPI_FAMILY)
 #	define HAS_WINTHREADS

diff --git a/config.h b/config.h
@@ -690,6 +690,10 @@ NAMESPACE_END
 #	define THREADS_AVAILABLE
 #endif
 
+#if defined(CRYPTOPP_BSD_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE) || defined(__CYGWIN__)
+# define UNIX_SIGNALS_AVAILABLE 1
+#endif
+
 #ifdef CRYPTOPP_WIN32_AVAILABLE
 # if !defined(WINAPI_FAMILY)
 #	define HAS_WINTHREADS

diff --git a/ossig.h b/ossig.h
@@ -9,15 +9,15 @@
 
 #include "config.h"
 
-#if defined(CRYPTOPP_BSD_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE)
+#if defined(UNIX_SIGNALS_AVAILABLE)
 # include <signal.h>
 #endif
 
 NAMESPACE_BEGIN(CryptoPP)
 
 // ************** Unix and Linux compatibles ***************
 
-#if defined(CRYPTOPP_BSD_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE) || defined(CRYPTOPP_DOXYGEN_PROCESSING)
+#if defined(UNIX_SIGNALS_AVAILABLE) || defined(CRYPTOPP_DOXYGEN_PROCESSING)
 
 //! \brief Signal handler function pointer
 //! \details SignalHandlerFn is provided as a stand alone function pointer with external "C" linkage

diff --git a/stdcpp.h b/stdcpp.h
@@ -40,6 +40,10 @@ namespace std {
 #include <mutex>
 #endif
 
+#if defined(CRYPTOPP_CXX11_RVALUES)
+# include <utility>
+#endif
+
 #include <cstdlib>
 #include <cstddef>
 #include <cstring>