smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: remove HAVE_PTHREAD_SIGNAL define it was forced on

Browse source
This commit is contained in:
sithlord48 2025-06-13 22:19:03 -04:00 committed by Nick Bolton
parent 60a148ce68
commit a3fe66f213
3 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmake/Libraries.cmake
View file

@ -158,7 +158,6 @@ macro(configure_unix_libs)
# For config.h, set some static values; it may be a good idea to make these # For config.h, set some static values; it may be a good idea to make these
# values dynamic for non-standard UNIX compilers. # values dynamic for non-standard UNIX compilers.
set(HAVE_PTHREAD_SIGNAL 1)
set(HAVE_SOCKLEN_T 1) set(HAVE_SOCKLEN_T 1)
# Unix only: For config.h, save the results based on a template (config.h.in). # Unix only: For config.h, save the results based on a template (config.h.in).

3
src/lib/Config.h.in
View file

@ -16,9 +16,6 @@
/* Define if you have POSIX threads libraries and header files. */ /* Define if you have POSIX threads libraries and header files. */
#cmakedefine HAVE_PTHREAD @HAVE_PTHREAD@ #cmakedefine HAVE_PTHREAD @HAVE_PTHREAD@
/* Define if you have `pthread_sigmask` and `pthread_kill` functions. */
#cmakedefine HAVE_PTHREAD_SIGNAL @HAVE_PTHREAD_SIGNAL@
/* Define if your compiler defines socklen_t. */ /* Define if your compiler defines socklen_t. */
#cmakedefine HAVE_SOCKLEN_T @HAVE_SOCKLEN_T@ #cmakedefine HAVE_SOCKLEN_T @HAVE_SOCKLEN_T@

13
src/lib/arch/unix/ArchMultithreadPosix.cpp
View file

@ -17,17 +17,6 @@
#define SIGWAKEUP SIGUSR1 #define SIGWAKEUP SIGUSR1
#if !HAVE_PTHREAD_SIGNAL
// boy, is this platform broken. forget about pthread signal
// handling and let signals through to every process. deskflow
// will not terminate cleanly when it gets SIGTERM or SIGINT.
#define pthread_sigmask sigprocmask
#define pthread_kill(tid_, sig_) kill(0, (sig_))
#define sigwait(set_, sig_)
#undef HAVE_POSIX_SIGWAIT
#define HAVE_POSIX_SIGWAIT 1
#endif
static void setSignalSet(sigset_t *sigset) static void setSignalSet(sigset_t *sigset)
{ {
sigemptyset(sigset); sigemptyset(sigset);
@ -300,9 +289,7 @@ ArchThread ArchMultithreadPosix::newThread(ThreadFunc func, void *data)
// can't tell the difference. // can't tell the difference.
if (!m_newThreadCalled) { if (!m_newThreadCalled) {
m_newThreadCalled = true; m_newThreadCalled = true;
#if HAVE_PTHREAD_SIGNAL
startSignalHandler(); startSignalHandler();
#endif
} }
lockMutex(m_threadMutex); lockMutex(m_threadMutex);