From 9ee8b3b41f9dd24e49f4fd80c5891f134b38d161 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Fri, 16 May 2014 11:55:53 +0200
Subject: [PATCH] enum: Don't directly include enum.h

To allow enum.h to depend on utils.h definitions, avoid its direct inclusion.
Instead include utils.h, which includes enum.h as well.
---
 src/libhydra/attributes/attributes.h              | 2 +-
 src/libsimaka/simaka_message.h                    | 2 +-
 src/libstrongswan/crypto/transform.h              | 2 +-
 src/libstrongswan/plugins/pgp/pgp_builder.c       | 3 +--
 src/libstrongswan/plugins/pkcs11/pkcs11_library.h | 2 +-
 src/libstrongswan/tests/suites/test_enum.c        | 1 -
 src/libstrongswan/utils/debug.h                   | 2 +-
 src/libstrongswan/utils/enum.c                    | 1 +
 src/libstrongswan/utils/utils.h                   | 6 +++---
 9 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/libhydra/attributes/attributes.h b/src/libhydra/attributes/attributes.h
index c3c37cfc4..5d1e9f9ba 100644
--- a/src/libhydra/attributes/attributes.h
+++ b/src/libhydra/attributes/attributes.h
@@ -24,7 +24,7 @@
 
 typedef enum configuration_attribute_type_t configuration_attribute_type_t;
 
-#include <utils/enum.h>
+#include <utils/utils.h>
 
 /**
  * Type of the attribute, as in IKEv2 RFC 3.15.1 or IKEv1 ModeConfig.
diff --git a/src/libsimaka/simaka_message.h b/src/libsimaka/simaka_message.h
index 32c39a348..9e2c7dea9 100644
--- a/src/libsimaka/simaka_message.h
+++ b/src/libsimaka/simaka_message.h
@@ -26,7 +26,7 @@
 #ifndef SIMAKA_MESSAGE_H_
 #define SIMAKA_MESSAGE_H_
 
-#include <utils/enum.h>
+#include <utils/utils.h>
 #include <eap/eap.h>
 
 #include "simaka_crypto.h"
diff --git a/src/libstrongswan/crypto/transform.h b/src/libstrongswan/crypto/transform.h
index 4a98f81e9..a585e9784 100644
--- a/src/libstrongswan/crypto/transform.h
+++ b/src/libstrongswan/crypto/transform.h
@@ -23,7 +23,7 @@
 
 typedef enum transform_type_t transform_type_t;
 
-#include <utils/enum.h>
+#include <utils/utils.h>
 
 /**
  * Type of a transform, as in IKEv2 RFC 3.3.2.
diff --git a/src/libstrongswan/plugins/pgp/pgp_builder.c b/src/libstrongswan/plugins/pgp/pgp_builder.c
index 3ff357202..152e83aaa 100644
--- a/src/libstrongswan/plugins/pgp/pgp_builder.c
+++ b/src/libstrongswan/plugins/pgp/pgp_builder.c
@@ -17,7 +17,7 @@
 #include "pgp_builder.h"
 #include "pgp_utils.h"
 
-#include <utils/enum.h>
+#include <utils/utils.h>
 #include <utils/debug.h>
 #include <credentials/keys/private_key.h>
 
@@ -273,4 +273,3 @@ private_key_t *pgp_private_key_load(key_type_t type, va_list args)
 			return NULL;
 	}
 }
-
diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_library.h b/src/libstrongswan/plugins/pkcs11/pkcs11_library.h
index abd99ed5f..b8b4ff746 100644
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_library.h
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_library.h
@@ -29,7 +29,7 @@ typedef struct pkcs11_library_t pkcs11_library_t;
 
 #include "pkcs11.h"
 
-#include <utils/enum.h>
+#include <utils/utils.h>
 #include <utils/chunk.h>
 #include <collections/enumerator.h>
 
diff --git a/src/libstrongswan/tests/suites/test_enum.c b/src/libstrongswan/tests/suites/test_enum.c
index 990d9cfad..512448a88 100644
--- a/src/libstrongswan/tests/suites/test_enum.c
+++ b/src/libstrongswan/tests/suites/test_enum.c
@@ -15,7 +15,6 @@
 
 #include "test_suite.h"
 
-#include <utils/enum.h>
 #include <utils/utils.h>
 
 /*******************************************************************************
diff --git a/src/libstrongswan/utils/debug.h b/src/libstrongswan/utils/debug.h
index c46d3fe55..f1c8c70ab 100644
--- a/src/libstrongswan/utils/debug.h
+++ b/src/libstrongswan/utils/debug.h
@@ -26,7 +26,7 @@ typedef enum level_t level_t;
 
 #include <stdio.h>
 
-#include "utils/enum.h"
+#include <utils/utils.h>
 
 /**
  * Debug message group.
diff --git a/src/libstrongswan/utils/enum.c b/src/libstrongswan/utils/enum.c
index 3db9a34e0..465121e79 100644
--- a/src/libstrongswan/utils/enum.c
+++ b/src/libstrongswan/utils/enum.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 
 #include <library.h>
+#include <utils/utils.h>
 
 #include "enum.h"
 
diff --git a/src/libstrongswan/utils/utils.h b/src/libstrongswan/utils/utils.h
index 53bfceda6..392f24e63 100644
--- a/src/libstrongswan/utils/utils.h
+++ b/src/libstrongswan/utils/utils.h
@@ -29,9 +29,6 @@
 #include <arpa/inet.h>
 #include <string.h>
 
-#include "enum.h"
-#include "utils/strerror.h"
-
 /**
  * strongSwan program return codes
  */
@@ -73,6 +70,9 @@
 # define TRUE  true
 #endif /* TRUE */
 
+#include "enum.h"
+#include "utils/strerror.h"
+
 /**
  * Helper function that compares two strings for equality
  */