Guard inclusion of <intrin.h> with VS2005 and above

pull/286/head
Jeffrey Walton 2016-09-17 18:42:35 -04:00
parent a0bc85cfc8
commit 7620976826
1 changed files with 4 additions and 2 deletions

4
trap.h
View File

@ -5,7 +5,7 @@
//! \brief Debugging and diagnostic assertions //! \brief Debugging and diagnostic assertions
//! \details <tt>CRYPTOPP_ASSERT</tt> is the library's debugging and diagnostic assertion. <tt>CRYPTOPP_ASSERT</tt> //! \details <tt>CRYPTOPP_ASSERT</tt> is the library's debugging and diagnostic assertion. <tt>CRYPTOPP_ASSERT</tt>
//! is enabled by <tt>CRYPTOPP_DEBUG</tt>, <tt>DEBUG</tt> or <tt>_DEBUG</tt>. //! is enabled by <tt>CRYPTOPP_DEBUG</tt>, <tt>DEBUG</tt> or <tt>_DEBUG</tt>.
//! \details <tt>CRYPTOPP_ASSERT</tt> raises a <tt>SIGTRAP</tt> (Unix) or calls <tt>DebugBreak()</tt> (Windows). //! \details <tt>CRYPTOPP_ASSERT</tt> raises a <tt>SIGTRAP</tt> (Unix) or calls <tt>__debugbreak()</tt> (Windows).
//! <tt>CRYPTOPP_ASSERT</tt> is only in effect when the user requests a debug configuration. Unlike Posix assert, //! <tt>CRYPTOPP_ASSERT</tt> is only in effect when the user requests a debug configuration. Unlike Posix assert,
//! <tt>NDEBUG</tt> (or failure to define it) does not affect the library. //! <tt>NDEBUG</tt> (or failure to define it) does not affect the library.
//! The traditional Posix define <tt>NDEBUG</tt> has no effect on <tt>CRYPTOPP_DEBUG</tt> or DebugTrapHandler. //! The traditional Posix define <tt>NDEBUG</tt> has no effect on <tt>CRYPTOPP_DEBUG</tt> or DebugTrapHandler.
@ -25,8 +25,10 @@
# if defined(CRYPTOPP_BSD_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE) # if defined(CRYPTOPP_BSD_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE)
# include <signal.h> # include <signal.h>
# elif defined(CRYPTOPP_WIN32_AVAILABLE) # elif defined(CRYPTOPP_WIN32_AVAILABLE)
# if (_MSC_VER >= 1400)
# include <intrin.h> # include <intrin.h>
# endif # endif
# endif
#endif // CRYPTOPP_DEBUG #endif // CRYPTOPP_DEBUG
// ************** run-time assertion *************** // ************** run-time assertion ***************