From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Sun, 9 Jan 2011 00:34:31 +0000 (-0500)
Subject: Move fill macro to toke.h
X-Git-Tag: SUDO_1_8_0~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4cc6322b483ac43ae9e659b76da6ae6bfede7d57;p=sudo

Move fill macro to toke.h
---

diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c
index c8a0ebbaa..353b595b7 100644
--- 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 6200826b2..6d3aedba6 100644
--- 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 360a04212..77a1738ea 100644
--- 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))