From: Martin Willi <martin@revosec.ch>
Date: Tue, 16 Dec 2014 15:55:29 +0000 (+0100)
Subject: apple: Redefine some additional clashing Mach types
X-Git-Tag: 5.2.2~14^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04337fed02e8dde1b184b3c163cc76138037905e;p=thirdparty%2Fstrongswan.git

apple: Redefine some additional clashing Mach types

While they usually are not included in a normal strongSwan build, the XPC
header indirectly defines these Mach types. To build charon-xpc, which uses
both XPC and strongSwan includes, we have to redefine these types.
---

diff --git a/src/libcharon/sa/task.h b/src/libcharon/sa/task.h
index f2c4299ccd..8e380851aa 100644
--- a/src/libcharon/sa/task.h
+++ b/src/libcharon/sa/task.h
@@ -22,6 +22,8 @@
 #ifndef TASK_H_
 #define TASK_H_
 
+#include <utils/utils.h>
+
 typedef enum task_type_t task_type_t;
 typedef struct task_t task_t;
 
diff --git a/src/libstrongswan/networking/host.h b/src/libstrongswan/networking/host.h
index 26f23bc997..db6f4dd499 100644
--- a/src/libstrongswan/networking/host.h
+++ b/src/libstrongswan/networking/host.h
@@ -24,6 +24,9 @@
 #ifndef HOST_H_
 #define HOST_H_
 
+#include <utils/utils.h>
+#include <utils/chunk.h>
+
 typedef enum host_diff_t host_diff_t;
 typedef struct host_t host_t;
 
@@ -31,9 +34,6 @@ typedef struct host_t host_t;
 #include <stdio.h>
 #include <sys/types.h>
 
-#include <utils/utils.h>
-#include <utils/chunk.h>
-
 /**
  * Representates a Host
  *
diff --git a/src/libstrongswan/processing/processor.h b/src/libstrongswan/processing/processor.h
index f96530e540..ee08870fb2 100644
--- a/src/libstrongswan/processing/processor.h
+++ b/src/libstrongswan/processing/processor.h
@@ -23,6 +23,8 @@
 #ifndef PROCESSOR_H_
 #define PROCESSOR_H_
 
+#include <utils/utils.h>
+
 typedef struct processor_t processor_t;
 
 #include <stdlib.h>
diff --git a/src/libstrongswan/utils/compat/apple.h b/src/libstrongswan/utils/compat/apple.h
index 77e0722799..61afb9d9e6 100644
--- a/src/libstrongswan/utils/compat/apple.h
+++ b/src/libstrongswan/utils/compat/apple.h
@@ -34,6 +34,12 @@
 /* Mach uses a semaphore_create() call, use a different name for ours */
 #define semaphore_create(x) strongswan_semaphore_create(x)
 
+/* Since OS X 10.10 XPC includes some additional conflicting Mach types */
+#define host_t strongswan_host_t
+#define processor_t strongswan_processor_t
+#define task_t strongswan_task_t
+#define thread_t strongswan_thread_t
+
 /* forward declaration, see below */
 static inline int precancellable_poll(struct pollfd fds[], nfds_t nfds,
 									  int timeout);