X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3bc8edd575d1c99b7f3a2a7a7bb374571c30b4ca..f0ccd2cbfa0b4ac110b81626da5a184b650b1080:/src/unix/appunix.cpp diff --git a/src/unix/appunix.cpp b/src/unix/appunix.cpp index 691a8a544e..4bf75e675b 100644 --- a/src/unix/appunix.cpp +++ b/src/unix/appunix.cpp @@ -8,13 +8,27 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/app.h" -#include "wx/log.h" +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/log.h" +#endif + #include "wx/evtloop.h" #include #include +#ifndef SA_RESTART + // don't use for systems which don't define it (at least VMS and QNX) + #define SA_RESTART 0 +#endif + // use unusual names for arg[cv] to avoid clashes with wxApp members with the // same names bool wxAppConsole::Initialize(int& argc_, wxChar** argv_) @@ -52,13 +66,23 @@ void wxAppConsole::CheckSignal() } } +// the type of the signal handlers we use is "void(*)(int)" while the real +// signal handlers are extern "C" and so have incompatible type and at least +// Sun CC warns about it, so use explicit casts to suppress these warnings as +// they should be harmless +extern "C" +{ + typedef void (*SignalHandler_t)(int); +} + bool wxAppConsole::SetSignalHandler(int signal, SignalHandler handler) { - const bool install = handler != SIG_DFL && handler != SIG_IGN; + const bool install = (SignalHandler_t)handler != SIG_DFL && + (SignalHandler_t)handler != SIG_IGN; struct sigaction sa; memset(&sa, 0, sizeof(sa)); - sa.sa_handler = &wxAppConsole::HandleSignal; + sa.sa_handler = (SignalHandler_t)&wxAppConsole::HandleSignal; sa.sa_flags = SA_RESTART; int res = sigaction(signal, &sa, 0); if ( res != 0 )