From 137c06babfc2b4830206dd536ffdf0a95bf99841 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Wed, 14 Dec 2011 15:21:35 +0100
Subject: [PATCH] Use a single task_type_t enum name for ME and non-ME variant

---
 src/libcharon/sa/tasks/task.c | 82 ++++++++++++-----------------------
 1 file changed, 27 insertions(+), 55 deletions(-)

diff --git a/src/libcharon/sa/tasks/task.c b/src/libcharon/sa/tasks/task.c
index f8ff56571..77c0af96a 100644
--- a/src/libcharon/sa/tasks/task.c
+++ b/src/libcharon/sa/tasks/task.c
@@ -16,61 +16,33 @@
 
 #include "task.h"
 
+ENUM(task_type_names, TASK_IKE_INIT, TASK_IKE_CERT_POST_V1,
+	"IKE_INIT",
+	"IKE_NATD",
+	"IKE_MOBIKE",
+	"IKE_AUTH",
+	"IKE_AUTH_LIFETIME",
+	"IKE_CERT_PRE",
+	"IKE_CERT_POST",
+	"IKE_CONFIG",
+	"IKE_REKEY",
+	"IKE_REAUTH",
+	"IKE_DELETE",
+	"IKE_DPD",
+	"IKE_VENDOR",
 #ifdef ME
-ENUM(task_type_names, TASK_IKE_INIT, TASK_IKE_CERT_POST_V1,
-	"IKE_INIT",
-	"IKE_NATD",
-	"IKE_MOBIKE",
-	"IKE_AUTH",
-	"IKE_AUTH_LIFETIME",
-	"IKE_CERT_PRE",
-	"IKE_CERT_POST",
-	"IKE_CONFIG",
-	"IKE_REKEY",
-	"IKE_REAUTH",
-	"IKE_DELETE",
-	"IKE_DPD",
-	"IKE_VENDOR",
 	"IKE_ME",
-	"CHILD_CREATE",
-	"CHILD_DELETE",
-	"CHILD_REKEY",
-	"MAIN_MODE",
-	"INFORMATIONAL",
-	"XAUTH",
-	"MODE_CONFIG",
-	"QUICK_MODE",
-	"VENDOR_V1",
-	"IKE_NATD_V1",
-	"IKE_CERT_PRE_V1",
-	"IKE_CERT_POST_V1",
-);
-#else
-ENUM(task_type_names, TASK_IKE_INIT, TASK_IKE_CERT_POST_V1,
-	"IKE_INIT",
-	"IKE_NATD",
-	"IKE_MOBIKE",
-	"IKE_AUTH",
-	"IKE_AUTH_LIFETIME",
-	"IKE_CERT_PRE",
-	"IKE_CERT_POST",
-	"IKE_CONFIG",
-	"IKE_REKEY",
-	"IKE_REAUTH",
-	"IKE_DELETE",
-	"IKE_DPD",
-	"IKE_VENDOR",
-	"CHILD_CREATE",
-	"CHILD_DELETE",
-	"CHILD_REKEY",
-	"MAIN_MODE",
-	"INFORMATIONAL",
-	"XAUTH",
-	"MODE_CONFIG",
-	"QUICK_MODE",
-	"VENDOR_V1",
-	"IKE_NATD_V1",
-	"IKE_CERT_PRE_V1",
-	"IKE_CERT_POST_V1",
-);
 #endif /* ME */
+	"CHILD_CREATE",
+	"CHILD_DELETE",
+	"CHILD_REKEY",
+	"MAIN_MODE",
+	"INFORMATIONAL",
+	"XAUTH",
+	"MODE_CONFIG",
+	"QUICK_MODE",
+	"VENDOR_V1",
+	"IKE_NATD_V1",
+	"IKE_CERT_PRE_V1",
+	"IKE_CERT_POST_V1",
+);