diff --git a/parser/dbus.cc b/parser/dbus.cc index 43c1066c5..a01b2b196 100644 --- a/parser/dbus.cc +++ b/parser/dbus.cc @@ -30,8 +30,6 @@ #include "parser_yacc.h" #include "dbus.h" -#define _(s) gettext(s) - int parse_dbus_mode(const char *str_mode, int *mode, int fail) { diff --git a/parser/lib.c b/parser/lib.c index 08cc4ca47..c3657a89a 100644 --- a/parser/lib.c +++ b/parser/lib.c @@ -24,7 +24,6 @@ #include #include #include -#define _(s) gettext(s) #include #include diff --git a/parser/parser.h b/parser/parser.h index cff0c248c..2b736f525 100644 --- a/parser/parser.h +++ b/parser/parser.h @@ -28,6 +28,9 @@ #include #include +#include +#define _(s) gettext(s) + #include "immunix.h" #include "libapparmor_re/apparmor_re.h" #include "libapparmor_re/aare_rules.h" diff --git a/parser/parser_alias.c b/parser/parser_alias.c index d495a5e59..381ea4cfb 100644 --- a/parser/parser_alias.c +++ b/parser/parser_alias.c @@ -20,8 +20,6 @@ #include #include #include -#include -#define _(s) gettext(s) #include "immunix.h" #include "parser.h" diff --git a/parser/parser_common.c b/parser/parser_common.c index 0a6b263d8..39677bd5c 100644 --- a/parser/parser_common.c +++ b/parser/parser_common.c @@ -17,9 +17,7 @@ */ #include #include -#include -#include -#define _(s) gettext(s) + #include "parser.h" /* Policy versioning is determined by a combination of 3 values: diff --git a/parser/parser_include.c b/parser/parser_include.c index 3f97a972a..234d2d208 100644 --- a/parser/parser_include.c +++ b/parser/parser_include.c @@ -44,11 +44,9 @@ #include #include #include -#include #include #include "parser.h" #include "parser_include.h" -#define _(s) gettext(s) /* An array of search directories, I sure hope 100's enough */ #define MAX_PATH 100 diff --git a/parser/parser_interface.c b/parser/parser_interface.c index b297085ca..37f622d38 100644 --- a/parser/parser_interface.c +++ b/parser/parser_interface.c @@ -24,8 +24,6 @@ #include #include #include -#include -#define _(s) gettext(s) #include #include @@ -37,11 +35,6 @@ #include #include -#include -#define _(s) gettext(s) - - - #define SD_CODE_SIZE (sizeof(u8)) #define SD_STR_LEN (sizeof(u16)) diff --git a/parser/parser_lex.l b/parser/parser_lex.l index 59b79fe83..375ab1afe 100644 --- a/parser/parser_lex.l +++ b/parser/parser_lex.l @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -38,8 +37,6 @@ #include #include -#define _(s) gettext(s) - #include "parser.h" #include "profile.h" #include "parser_include.h" diff --git a/parser/parser_main.c b/parser/parser_main.c index 4902908b1..85ad52bff 100644 --- a/parser/parser_main.c +++ b/parser/parser_main.c @@ -28,10 +28,7 @@ #include #include #include -#include -#include #include -#define _(s) gettext(s) /* enable the following line to get voluminous debug info */ /* #define DEBUG */ diff --git a/parser/parser_merge.c b/parser/parser_merge.c index 3781061d2..06d0b0e23 100644 --- a/parser/parser_merge.c +++ b/parser/parser_merge.c @@ -21,8 +21,6 @@ #include #include #include -#include -#define _(s) gettext(s) #include "parser.h" #include "profile.h" diff --git a/parser/parser_misc.c b/parser/parser_misc.c index b466678da..b69064e2c 100644 --- a/parser/parser_misc.c +++ b/parser/parser_misc.c @@ -26,8 +26,6 @@ #include #include #include -#include -#define _(s) gettext(s) #include #include #include diff --git a/parser/parser_policy.c b/parser/parser_policy.c index cdd787d89..d94135084 100644 --- a/parser/parser_policy.c +++ b/parser/parser_policy.c @@ -26,9 +26,7 @@ #include #include #include -#include #include -#define _(s) gettext(s) #include "parser.h" #include "profile.h" diff --git a/parser/parser_regex.c b/parser/parser_regex.c index ea04dfe27..299dfefb4 100644 --- a/parser/parser_regex.c +++ b/parser/parser_regex.c @@ -19,10 +19,8 @@ #include #include #include -#include #include #include -#define _(s) gettext(s) #include #include diff --git a/parser/parser_symtab.c b/parser/parser_symtab.c index 135b6bc71..1484c927d 100644 --- a/parser/parser_symtab.c +++ b/parser/parser_symtab.c @@ -20,9 +20,7 @@ #include #include #include -#include #include -#define _(s) gettext(s) #include "immunix.h" #include "parser.h" diff --git a/parser/parser_variable.c b/parser/parser_variable.c index 26f8bbf27..00807b798 100644 --- a/parser/parser_variable.c +++ b/parser/parser_variable.c @@ -21,13 +21,10 @@ #include #include #include -#include #include #include -#define _(s) gettext(s) - /* #define DEBUG */ #include "parser.h" diff --git a/parser/parser_yacc.y b/parser/parser_yacc.y index 814283139..e1626a224 100644 --- a/parser/parser_yacc.y +++ b/parser/parser_yacc.y @@ -26,11 +26,9 @@ #include #include #include -#include #include #include -#define _(s) gettext(s) /* #define DEBUG */