Merge commit '9ffea830' into wireguard-next-tmp7-1

2 files changed, 5 insertions, 5 deletions

diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index f86ff6f1..92a25c67 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -52,11 +52,6 @@
 #include "lib/hash.h"
 #include "lib/base64.h"
 
-struct keyword {
-  byte *name;
-  int value;
-};
-
 #include "conf/keywords.h"
 
 /* Could be defined by Bison in cf-parse.tab.h, inteferes with SYM hash */
diff --git a/conf/conf.h b/conf/conf.h
index 1413cb58..c301df1d 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -110,6 +110,11 @@ void cfg_copy_list(list *dest, list *src, unsigned node_size);
 
 extern int (*cf_read_hook)(byte *buf, uint max, int fd);
 
+struct keyword {
+  byte *name;
+  int value;
+};
+
 struct symbol {
   node n;				/* In list of symbols in config */
   struct symbol *next;