From: Victor Julien <victor@inliniac.net>
Date: Tue, 8 Jan 2013 12:47:14 +0000 (+0100)
Subject: Fix double definition of CPU_* macro's for Darwin/OSX. Bug 701.
X-Git-Tag: suricata-1.4.1~82
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34d063adeac6e7693feb97ebb0b141c49f25c86d;p=thirdparty%2Fsuricata.git

Fix double definition of CPU_* macro's for Darwin/OSX. Bug 701.
---

diff --git a/src/tm-threads.c b/src/tm-threads.c
index c4b32bf714..c926e0fa2c 100644
--- a/src/tm-threads.c
+++ b/src/tm-threads.c
@@ -68,14 +68,6 @@ __thread uint64_t rwr_lock_cnt;
 #include <sys/cpuset.h>
 #include <sys/thr.h>
 #define cpu_set_t cpuset_t
-#elif OS_DARWIN
-#include <mach/mach.h>
-#include <mach/mach_init.h>
-#include <mach/thread_policy.h>
-#define cpu_set_t thread_affinity_policy_data_t
-#define CPU_SET(cpu_id, new_mask) ((*(new_mask)).affinity_tag = ((cpu_id) + 1))
-#define CPU_ISSET(cpu_id, new_mask) (((*(new_mask)).affinity_tag == ((cpu_id) + 1)))
-#define CPU_ZERO(new_mask) ((*(new_mask)).affinity_tag = THREAD_AFFINITY_TAG_NULL)
 #endif /* OS_FREEBSD */
 
 /* prototypes */