Move fill macro to toke.h

diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c
index c8a0ebbaac07fa0c6a0df2e6c260d5b720feff16..353b595b7ac6e5386d563d0695e43515f1935571 100644 (file)
--- a/plugins/sudoers/toke.c
+++ b/plugins/sudoers/toke.c
@@ -1470,8 +1470,6 @@ static int _push_include(char *, int);
 static int pop_include(void);
 static char *parse_include(char *);
 
-#define fill(a, b)             fill_txt(a, b, 0)
-
 #define        push_include(_p)        (_push_include((_p), FALSE))
 #define        push_includedir(_p)     (_push_include((_p), TRUE))
 

diff --git a/plugins/sudoers/toke.h b/plugins/sudoers/toke.h
index 6200826b238ba781b7b7693c26691b7ddd641e83..6d3aedba633a453c185bec83e567162add85a984 100644 (file)
--- a/plugins/sudoers/toke.h
+++ b/plugins/sudoers/toke.h
@@ -24,6 +24,8 @@ int fill_txt(char *, int, int);
 int ipv6_valid(const char *s);
 void yyerror(const char *);
 
+#define fill(a, b)     fill_txt(a, b, 0)
+
 /* realloc() to size + COMMANDARGINC to make room for command args */
 #define COMMANDARGINC   64
 

diff --git a/plugins/sudoers/toke.l b/plugins/sudoers/toke.l
index 360a04212b8c93bda38fb2fca644738b8fc66736..77a1738ea37c15c6b37f4fb2a4d27956ed36befd 100644 (file)
--- a/plugins/sudoers/toke.l
+++ b/plugins/sudoers/toke.l
@@ -81,8 +81,6 @@ static int _push_include(char *, int);
 static int pop_include(void);
 static char *parse_include(char *);
 
-#define fill(a, b)             fill_txt(a, b, 0)
-
 #define        push_include(_p)        (_push_include((_p), FALSE))
 #define        push_includedir(_p)     (_push_include((_p), TRUE))