From 640c75bb2e9c5dc7860ff98215db4d0c29185877 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 21 May 2014 14:36:46 +0200 Subject: [PATCH] starter: Move kw_entry_t definition --- src/starter/ipsec-parser.h | 7 ------- src/starter/keywords.h | 12 ++++++++++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/starter/ipsec-parser.h b/src/starter/ipsec-parser.h index 1c6cf20eff..fb64bfa2a7 100644 --- 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 5b6b28bf85..94af493f8f 100644 --- 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_ */ -- 2.47.2