O

8 files changed, 14 insertions, 4 deletions

diff --git a/ace/OS.h b/ace/OS.h
index d36b663ddf9..749e3cd9ddb 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -1340,16 +1340,16 @@ typedef int ACE_thread_key_t;
 // This must come after signal.h is #included.
 #if defined (SCO)
 #define SIGIO SIGPOLL
-#endif 
+#include <sys/regset.h>
+#endif /* SCO */
 
-#if defined (SCO) || defined (FreeBSD)
+#if defined (ACE_HAS_SIG_MACROS)
 #undef sigemptyset
 #undef sigfillset
 #undef sigaddset
 #undef sigdelset
 #undef sigismember
-#include <sys/regset.h>
-#endif /* SCO */
+#endif /* ACE_HAS_SIG_MACROS */
 
 // This must come after signal.h is #included.  It's to counteract
 // the sigemptyset and sigfillset #defines, which only happen
diff --git a/ace/README b/ace/README
index 878cf514643..80e74975093 100644
--- a/ace/README
+++ b/ace/README
@@ -93,6 +93,7 @@ ACE_HAS_REGEX				Platform supports the POSIX regular expression library
 ACE_HAS_SELECT_H			Platform has special header for select().
 ACE_HAS_SEMUN				Compiler/platform defines a union semun for SysV shared memory
 ACE_HAS_SIGINFO_T			Platform supports SVR4 extended signals
+ACE_HAS_SIG_MACROS			Platform/compiler has macros for sig{empty,fill,add,del}set (e.g., SCO and FreeBSD)
 ACE_HAS_SIGNAL_OBJECT_AND_WAIT		Platform supports the Win32 SignalObjectAndWait() function (WinNT 4.0 and beyond).
 ACE_HAS_SIGNAL_SAFE_OS_CALLS		Automatically restart OS system calls when EINTR occurs
 ACE_HAS_SIGWAIT				Platform/compiler has the sigwait(2) prototype
diff --git a/ace/config-freebsd-pthread.h b/ace/config-freebsd-pthread.h
index 1239f89e8ed..0f94dad37c6 100644
--- a/ace/config-freebsd-pthread.h
+++ b/ace/config-freebsd-pthread.h
@@ -21,6 +21,7 @@
 #define ACE_NEEDS_SYSTIME_H
 
 #define ACE_LACKS_STRRECVFD
+#define ACE_HAS_SIG_MACROS
 
 #define ACE_HAS_SIN_LEN
 
diff --git a/ace/config-freebsd.h b/ace/config-freebsd.h
index b439e0a106c..0dcac73c5f5 100644
--- a/ace/config-freebsd.h
+++ b/ace/config-freebsd.h
@@ -12,6 +12,7 @@
 // Platform specific directives
 #define FreeBSD
 
+#define ACE_HAS_SIG_MACROS
 // Platform supports POSIX timers via timestruct_t.
 #define ACE_HAS_POSIX_TIME
 #define ACE_NEEDS_SYSTIME_H
diff --git a/ace/config-sco-4.2-nothread.h b/ace/config-sco-4.2-nothread.h
index a80662db60c..0f48f519c6c 100644
--- a/ace/config-sco-4.2-nothread.h
+++ b/ace/config-sco-4.2-nothread.h
@@ -20,6 +20,7 @@
 #define MAXPATHLEN 1023
 #endif /* SCO */
 
+#define ACE_HAS_SIG_MACROS
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 #define ACE_TEMPLATES_REQUIRE_SPECIALIZATION
 #define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
diff --git a/ace/config-sco-5.0.0-fsu-pthread.h b/ace/config-sco-5.0.0-fsu-pthread.h
index 3eab0ef2a72..4419739d621 100644
--- a/ace/config-sco-5.0.0-fsu-pthread.h
+++ b/ace/config-sco-5.0.0-fsu-pthread.h
@@ -16,6 +16,8 @@
 #define MAXPATHLEN 1023
 #endif /* SCO */
 
+#define ACE_HAS_SIG_MACROS
+
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 #define ACE_TEMPLATES_REQUIRE_SPECIALIZATION
 #define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
diff --git a/ace/config-sco-5.0.0-mit-pthread.h b/ace/config-sco-5.0.0-mit-pthread.h
index dcff4c82637..aceecd497f1 100644
--- a/ace/config-sco-5.0.0-mit-pthread.h
+++ b/ace/config-sco-5.0.0-mit-pthread.h
@@ -14,6 +14,8 @@
 #define	_SVID3
 #endif /* SCO */
 
+#define ACE_HAS_SIG_MACROS
+
 #if defined (SCO) && !defined (MAXPATHLEN)
 #define MAXPATHLEN 1023
 #endif /* SCO */
diff --git a/ace/config-sco-5.0.0-nothread.h b/ace/config-sco-5.0.0-nothread.h
index 800189f5383..71a4f7699d3 100644
--- a/ace/config-sco-5.0.0-nothread.h
+++ b/ace/config-sco-5.0.0-nothread.h
@@ -12,6 +12,8 @@
 #define SCO
 #endif /* SCO */
 
+#define ACE_HAS_SIG_MACROS
+
 #if defined (SCO) && !defined (MAXPATHLEN)
 #define MAXPATHLEN 1023
 #endif /* SCO */