diff options
| author | Maria Matejka <mq@ucw.cz> | 2019-03-18 12:54:40 +0100 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2019-03-18 12:54:40 +0100 |
| commit | 8d65add626b34256879a3e83855af3c0fa8ce4e7 (patch) | |
| tree | dafa110c47bc328f4006d4298fd641e8210381b4 /filter | |
| parent | 2f02c25e36f3946019c24dafe9b894a9e195350d (diff) | |
| parent | 5d511948cddee415c2f0f1103bda0468a193f2d6 (diff) | |
Merge branch 'master' into HEAD
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/Makefile | 4 | ||||
| -rw-r--r-- | filter/f-inst.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/filter/Makefile b/filter/Makefile index 9562a2ee..b2f8d96d 100644 --- a/filter/Makefile +++ b/filter/Makefile @@ -3,8 +3,6 @@ obj := $(src-o-files) $(all-daemon) $(cf-local) -$(conf-y-targets) $(conf-lex-targets) $(src-o-files): $(o)inst-gen.h - M4FLAGS_FILTERS=$(filter-out -s,$(M4FLAGS)) $(o)inst-gen.h: $(s)decl.m4 $(s)f-inst.c $(objdir)/.dir-stamp @@ -16,7 +14,7 @@ $(o)inst-gen.c: $(s)decl.m4 $(s)f-inst.c $(objdir)/.dir-stamp $(o)inst-interpret.c: $(s)decl.m4 $(s)f-inst.c $(objdir)/.dir-stamp $(M4) $(M4FLAGS_FILTERS) -DTARGET=I -P $^ >$@ -$(o)filter.o: $(o)inst-interpret.c $(o)inst-gen.h +prepare: $(o)inst-interpret.c $(o)inst-gen.h tests_src := tree_test.c filter_test.c trie_test.c tests_targets := $(tests_targets) $(tests-target-files) diff --git a/filter/f-inst.c b/filter/f-inst.c index 6f031782..3fea16c4 100644 --- a/filter/f-inst.c +++ b/filter/f-inst.c @@ -650,7 +650,7 @@ l->count = 1; l->attrs[0].id = da.ea_code; l->attrs[0].flags = 0; - l->attrs[0].type = EAF_TYPE_UNDEF | EAF_TEMP | EAF_ORIGINATED | EAF_FRESH; + l->attrs[0].type = EAF_TYPE_UNDEF | EAF_ORIGINATED | EAF_FRESH; l->attrs[0].u.data = 0; f_rta_cow(fs); |