Use a single task_type_t enum name for ME and non-ME variant
authorMartin Willi <martin@revosec.ch>
Wed, 14 Dec 2011 14:21:35 +0000 (15:21 +0100)
committerMartin Willi <martin@revosec.ch>
Tue, 20 Mar 2012 16:31:21 +0000 (17:31 +0100)
src/libcharon/sa/tasks/task.c

index f8ff565..77c0af9 100644 (file)
@@ -16,7 +16,6 @@
 
 #include "task.h"
 
-#ifdef ME
 ENUM(task_type_names, TASK_IKE_INIT, TASK_IKE_CERT_POST_V1,
        "IKE_INIT",
        "IKE_NATD",
@@ -31,7 +30,9 @@ ENUM(task_type_names, TASK_IKE_INIT, TASK_IKE_CERT_POST_V1,
        "IKE_DELETE",
        "IKE_DPD",
        "IKE_VENDOR",
+#ifdef ME
        "IKE_ME",
+#endif /* ME */
        "CHILD_CREATE",
        "CHILD_DELETE",
        "CHILD_REKEY",
@@ -45,32 +46,3 @@ ENUM(task_type_names, TASK_IKE_INIT, TASK_IKE_CERT_POST_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 */