# HG changeset patch # User David A. Holland # Date 1434088860 14400 # Node ID 80e243f2047db4215973897901cfbf63039bc940 # Parent 8d8a4bfd4684013fd66628b7d221d1c59ca7fb02 Revert addition of "isspecial" field in struct macro. It doesn't do anything useful any more. diff -r 8d8a4bfd4684 -r 80e243f2047d macro.c --- a/macro.c Fri Jun 12 01:55:52 2015 -0400 +++ b/macro.c Fri Jun 12 02:01:00 2015 -0400 @@ -56,7 +56,6 @@ char *name; unsigned hash; bool hasparams; - bool isspecial; bool inuse; }; DECLARRAY(macro, static UNUSED); @@ -172,7 +171,6 @@ m->hash = hash; m->name = dostrdup(name); m->hasparams = false; - m->isspecial = false; stringarray_init(&m->params); expansionitemarray_init(&m->expansion); m->inuse = false; @@ -199,10 +197,6 @@ struct expansionitem *ei1, *ei2; const char *p1, *p2; - if (m2->isspecial) { - return false; - } - if (strcmp(m1->name, m2->name) != 0) { return false; } @@ -608,7 +602,6 @@ struct expansionitem *ei; m = macro_define_common_start(p, "__FILE__", p); - m->isspecial = true; ei = expansionitem_create_file(); expansionitemarray_add(&m->expansion, ei, NULL); macro_define_common_end(m); @@ -621,7 +614,6 @@ struct expansionitem *ei; m = macro_define_common_start(p, "__LINE__", p); - m->isspecial = true; ei = expansionitem_create_line(); expansionitemarray_add(&m->expansion, ei, NULL); macro_define_common_end(m);