affinity: fix compilation on SunOS

diff --git a/src/tm-threads.c b/src/tm-threads.c
index 8442a1e845595d25871d06f621a6e18382040435..08fb6429ee7c7d67029c07cf272545a0da9d568c 100644 (file)
--- a/src/tm-threads.c
+++ b/src/tm-threads.c
@@ -929,7 +929,7 @@ TmSlot *TmSlotGetSlotForTM(int tm_id)
     return NULL;
 }
 
-#if !defined __CYGWIN__ && !defined OS_WIN32 && !defined __OpenBSD__
+#if !defined __CYGWIN__ && !defined OS_WIN32 && !defined __OpenBSD__ && !defined sun
 static int SetCPUAffinitySet(cpu_set_t *cs)
 {
 #if defined OS_FREEBSD
@@ -963,7 +963,7 @@ static int SetCPUAffinitySet(cpu_set_t *cs)
  */
 static int SetCPUAffinity(uint16_t cpuid)
 {
-#if defined __OpenBSD__
+#if defined __OpenBSD__ || defined sun
     return 0;
 #else
     int cpu = (int)cpuid;
@@ -1097,7 +1097,7 @@ TmEcode TmThreadSetupOptions(ThreadVars *tv)
         SetCPUAffinity(tv->cpu_affinity);
     }
 
-#if !defined __CYGWIN__ && !defined OS_WIN32 && !defined __OpenBSD__
+#if !defined __CYGWIN__ && !defined OS_WIN32 && !defined __OpenBSD__ && !defined sun
     if (tv->thread_setup_flags & THREAD_SET_PRIORITY)
         TmThreadSetPrio(tv);
     if (tv->thread_setup_flags & THREAD_SET_AFFTYPE) {

diff --git a/src/util-affinity.c b/src/util-affinity.c
index 51925a9f3b48475d92ddc9a57b29494b3abcd346..37539aef66b52369421a0307d9e10ea8be2c4c84 100644 (file)
--- a/src/util-affinity.c
+++ b/src/util-affinity.c
@@ -76,7 +76,7 @@ ThreadsAffinityType * GetAffinityTypeFromName(const char *name)
     return NULL;
 }
 
-#if !defined __CYGWIN__ && !defined OS_WIN32 && !defined __OpenBSD__
+#if !defined __CYGWIN__ && !defined OS_WIN32 && !defined __OpenBSD__ && !defined sun
 static void AffinitySetupInit()
 {
     int i, j;
@@ -166,7 +166,7 @@ static void BuildCpuset(const char *name, ConfNode *node, cpu_set_t *cpu)
 
 void AffinitySetupLoadFromConfig()
 {
-#if !defined __CYGWIN__ && !defined OS_WIN32 && !defined __OpenBSD__
+#if !defined __CYGWIN__ && !defined OS_WIN32 && !defined __OpenBSD__ && !defined sun
     ConfNode *root = ConfGetNode("threading.cpu-affinity");
     ConfNode *affinity;
 
@@ -285,7 +285,7 @@ void AffinitySetupLoadFromConfig()
 int AffinityGetNextCPU(ThreadsAffinityType *taf)
 {
     int ncpu = 0;
-#if !defined __CYGWIN__ && !defined OS_WIN32 && !defined __OpenBSD__
+#if !defined __CYGWIN__ && !defined OS_WIN32 && !defined __OpenBSD__ && !defined sun
     int iter = 0;
     SCMutexLock(&taf->taf_mutex);
     ncpu = taf->lcpu;

diff --git a/src/util-affinity.h b/src/util-affinity.h
index db12276c943d0ec327c19230ff6353e670c75007..bd9e1626ea0b37be6eaece47dd8bfb87bd54f082 100644 (file)
--- a/src/util-affinity.h
+++ b/src/util-affinity.h
@@ -68,7 +68,7 @@ typedef struct ThreadsAffinityType_ {
     SCMutex taf_mutex;
     uint16_t lcpu; /* use by exclusive mode */
 
-#if !defined __CYGWIN__ && !defined OS_WIN32 && !defined __OpenBSD__
+#if !defined __CYGWIN__ && !defined OS_WIN32 && !defined __OpenBSD__ && !defined sun
     cpu_set_t cpu_set;
     cpu_set_t lowprio_cpu;
     cpu_set_t medprio_cpu;