arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compile under SunCC 5.11-5.13 (Issue 285)

pull/286/head
Jeffrey Walton 2016-09-18 17:29:32 -04:00
parent f57c4dced5
commit d689c11b2d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ossig.h
View File

@ -18,6 +18,7 @@ NAMESPACE_BEGIN(CryptoPP)
// ************** Unix and Linux compatibles *************** // ************** Unix and Linux compatibles ***************
#if defined(CRYPTOPP_BSD_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE) || defined(CRYPTOPP_DOXYGEN_PROCESSING) #if defined(CRYPTOPP_BSD_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE) || defined(CRYPTOPP_DOXYGEN_PROCESSING)
//! \brief Signal handler function pointer //! \brief Signal handler function pointer
//! \sa SignalHandler //! \sa SignalHandler
extern "C" { extern "C" {
@ -55,11 +56,10 @@ struct SignalHandler
//! because the destructor may not run. <tt>setjmp</tt> is why cpu.cpp does not use SignalHandler //! because the destructor may not run. <tt>setjmp</tt> is why cpu.cpp does not use SignalHandler
//! during CPU feature testing. //! during CPU feature testing.
//! \since Crypto++ 5.6.5 //! \since Crypto++ 5.6.5
SignalHandler(SignalHandlerFn pfn = 0, int flags = 0) : m_installed(false) SignalHandler(SignalHandlerFn pfn = NULL, int flags = 0) : m_installed(false)
{ {
// http://pubs.opengroup.org/onlinepubs/007908799/xsh/sigaction.html // http://pubs.opengroup.org/onlinepubs/007908799/xsh/sigaction.html
struct sigaction new_handler; struct sigaction new_handler;
// memset(&new_handler, 0x00, sizeof(new_handler));
do do
{ {
@ -71,8 +71,8 @@ struct SignalHandler
// Don't step on another's handler if Overwrite=false // Don't step on another's handler if Overwrite=false
if (m_old.sa_handler != 0 && !O) break; if (m_old.sa_handler != 0 && !O) break;
// Set up the structure to specify the action. // Sun Studio 12.2-12.4 needs the two casts, and they must be C-style casts
new_handler.sa_handler = (pfn ? pfn : &SignalHandler::NullHandler); new_handler.sa_handler = (SignalHandlerFn)(pfn ? pfn : (SignalHandlerFn)&SignalHandler::NullHandler);
new_handler.sa_flags = (pfn ? flags : 0); new_handler.sa_flags = (pfn ? flags : 0);
ret = sigemptyset (&new_handler.sa_mask); ret = sigemptyset (&new_handler.sa_mask);