starter: Move kw_entry_t definition

diff --git a/src/starter/ipsec-parser.h b/src/starter/ipsec-parser.h
index 1c6cf20eff859e627958abd33c18225bc9c93713..fb64bfa2a7b3ea141cfec17f3096d4d5eb29eacd 100644 (file)
--- a/src/starter/ipsec-parser.h
+++ b/src/starter/ipsec-parser.h
@@ -17,13 +17,6 @@
 
 #include "keywords.h"
 
-typedef struct kw_entry kw_entry_t;
-
-struct kw_entry {
-       char *name;
-       kw_token_t token;
-};
-
 typedef struct kw_list kw_list_t;
 
 struct kw_list {

diff --git a/src/starter/keywords.h b/src/starter/keywords.h
index 5b6b28bf85463858134531f096bac02e4f2807d2..94af493f8fee66cf9418b5f8e85d5badbea9f958 100644 (file)
--- a/src/starter/keywords.h
+++ b/src/starter/keywords.h
@@ -16,7 +16,10 @@
 #ifndef _KEYWORDS_H_
 #define _KEYWORDS_H_
 
-typedef enum {
+typedef enum kw_token_t kw_token_t;
+typedef struct kw_entry_t kw_entry_t;
+
+enum kw_token_t {
        /* config setup keywords */
        KW_CHARONDEBUG,
        KW_UNIQUEIDS,
@@ -185,6 +188,11 @@ typedef enum {
        KW_ALSO,
        KW_AUTO,
 
-} kw_token_t;
+};
+
+struct kw_entry_t {
+       char *name;
+       kw_token_t token;
+};
 
 #endif /* _KEYWORDS_H_ */