Merge pull request #2218 from jwillemsen/jwi-pthreadsigmask

Cleanup ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE, all platforms support it s…
DOCGroup · Apr 15, 2024 · c247ac5 · c247ac5
2 parents 168a28c + 4e46f75
commit c247ac5
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 25 deletions.
diff --git a/ACE/ace/config-face-conftest.h b/ACE/ace/config-face-conftest.h
@@ -23,7 +23,6 @@
 #define ACE_HAS_MSG
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_POSIX_NONBLOCK
-#define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_OPAQUE_PTHREAD_T
 #define ACE_HAS_REENTRANT_FUNCTIONS

diff --git a/ACE/ace/config-hurd.h b/ACE/ace/config-hurd.h
@@ -67,7 +67,6 @@
 
 #if (__GLIBC__  > 2)  || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)
 # define ACE_HAS_ISASTREAM_PROTOTYPE
-# define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE
 # define ACE_HAS_CPU_SET_T
 #endif /* __GLIBC__ > 2 || __GLIBC__ === 2 && __GLIBC_MINOR__ >= 3) */
 

diff --git a/ACE/ace/config-kfreebsd.h b/ACE/ace/config-kfreebsd.h
@@ -164,9 +164,6 @@
 /* Define to 1 if platform has pthread_setconcurrency(). */
 #define ACE_HAS_PTHREAD_SETCONCURRENCY 1
 
-/* Define to 1 if platform has the declaration of pthread_sigmask(). */
-#define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE 1
-
 /* Platform has pread() and pwrite() support. */
 #define ACE_HAS_P_READ_WRITE 1
 

diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
@@ -40,7 +40,6 @@
 
 #if (__GLIBC__  > 2)  || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)
 #  define ACE_HAS_ISASTREAM_PROTOTYPE
-#  define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE
 #  define ACE_HAS_CPU_SET_T
 #  define ACE_HAS_GLIBC_2_2_3
 #endif /* __GLIBC__ > 2 || __GLIBC__ === 2 && __GLIBC_MINOR__ >= 3) */

diff --git a/ACE/ace/config-lynxos-178.h b/ACE/ace/config-lynxos-178.h
@@ -53,7 +53,6 @@
 #if ACE_MT_SAFE == 1
   // Platform supports threads.
 # define ACE_HAS_NONCONST_PTHREAD_SIGMASK
-# define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE
 #endif /* ACE_MT_SAFE */
 
 #include /**/ "ace/post.h"

diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h
@@ -66,7 +66,6 @@
 #define ACE_HAS_PTHREADS_UNIX98_EXT
 #define ACE_HAS_PTHREAD_GETCONCURRENCY
 #define ACE_HAS_PTHREAD_SETCONCURRENCY
-#define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE
 #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
 #define ACE_HAS_REENTRANT_FUNCTIONS
 #define ACE_HAS_SCANDIR

diff --git a/ACE/ace/config-mqx.h b/ACE/ace/config-mqx.h
@@ -418,7 +418,6 @@ inline int puts(const char* str) {
 #define ACE_MKDIR_LACKS_MODE
 
 // POSIX
-#define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE
 #define ACE_LACKS_SEMBUF_T
 #define ACE_LACKS_UNIX_DOMAIN_SOCKETS
 #define ACE_LACKS_KILL

diff --git a/ACE/ace/config-openbsd.h b/ACE/ace/config-openbsd.h
@@ -48,7 +48,6 @@
 #define ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP
 #define ACE_HAS_PTHREAD_NP_H
 #define ACE_HAS_PTHREAD_SETCONCURRENCY
-#define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE
 #define ACE_HAS_P_READ_WRITE
 #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
 #define ACE_HAS_REENTRANT_FUNCTIONS

diff --git a/ACE/ace/config-win32-mingw64.h b/ACE/ace/config-win32-mingw64.h
@@ -47,15 +47,6 @@
 #endif
 # define ACE_FILENO_EQUIVALENT ::_fileno
 
-// Latest version of MingW64 (GCC 4.8.2) with Win32 threading
-// defines a 'pthread_sigmask' macro when including signal.h.
-// We have to remove that one since ACE declares a (non-functional)
-// pthread_sigmask method in ACE_OS.
-#include <signal.h>
-#if defined (pthread_sigmask)
-#  undef pthread_sigmask
-#endif
-
 #define ACE_HAS_SSIZE_T
 #undef ACE_LACKS_TELLDIR
 #undef ACE_LACKS_SEEKDIR
@@ -119,8 +110,6 @@
 #define ACE_LACKS_UID_T
 #define ACE_LACKS_GID_T
 
-#define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE
-
 #define ACE_INT64_FORMAT_SPECIFIER_ASCII "%I64d"
 #define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%I64u"
 

diff --git a/ACE/ace/os_include/os_signal.h b/ACE/ace/os_include/os_signal.h
@@ -188,10 +188,6 @@ extern "C"
 #  endif /* ACE_SIGRTMAX */
 #endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */
 
-#if !defined (ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE)
-  int pthread_sigmask(int, const sigset_t *, sigset_t *);
-#endif /*!ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */