summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2022-03-19 18:01:46 +0000
committerSteve Huston <shuston@riverace.com>2022-03-19 18:01:46 +0000
commitbbe56f774f23d10bff8d082500e321ee9dda6bcb (patch)
tree797ac3ca7166b33c651379c9e8b52675d18da1f3
parent45937f8008fc7f9d0978549a945ecb9f20eac8b7 (diff)
downloadATCD-bbe56f774f23d10bff8d082500e321ee9dda6bcb.tar.gz
Refactor preproc so ACE_HAS_CPU_SET_T is obeyed
-rw-r--r--ACE/ace/os_include/os_sched.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/ACE/ace/os_include/os_sched.h b/ACE/ace/os_include/os_sched.h
index c28f8cf947d..10cc63d4325 100644
--- a/ACE/ace/os_include/os_sched.h
+++ b/ACE/ace/os_include/os_sched.h
@@ -36,17 +36,20 @@ extern "C"
{
#endif /* __cplusplus */
-#if !defined (__cpu_set_t_defined) || !defined (ACE_HAS_CPU_SET_T)
-#if defined (ACE_HAS_CPUSET_T)
+// We need a cpu_set_t - most platforms have it natively (ACE_HAS_CPU_SET_T).
+// At least one has a similar cpuset_t (ACE_HAS_CPUSET_T)
+// All others get it defined here.
+#if !defined (ACE_HAS_CPU_SET_T)
+# if defined (ACE_HAS_CPUSET_T)
typedef cpuset_t cpu_set_t;
-#else
-# define ACE_CPU_SETSIZE 1024
+# else
+# define ACE_CPU_SETSIZE 1024
typedef struct
{
ACE_UINT32 bit_array_[ACE_CPU_SETSIZE / (8 * sizeof (ACE_UINT32))];
} cpu_set_t;
-#endif
-#endif /* !ACE_HAS_CPU_SET_T || !__cpu_set_t_defined */
+#endif /* ACE_HAS_CPUSET_T */
+#endif /* ACE_HAS_CPU_SET_T */
#ifdef __cplusplus
}