Mercurial > ~dholland > hg > tradcpp > index.cgi
comparison macro.c @ 163:e1dfa3f90b6c
Merge mismatch resulted in forgotten initialisation of isspecial.
author | Joerg Sonnenberger <joerg@bec.de> |
---|---|
date | Fri, 27 Feb 2015 13:44:39 +0100 |
parents | 82cc6fa54b01 |
children | f14f5352956c |
comparison
equal
deleted
inserted
replaced
162:82cc6fa54b01 | 163:e1dfa3f90b6c |
---|---|
170 m->defplace = *p1; | 170 m->defplace = *p1; |
171 m->expansionplace = *p2; | 171 m->expansionplace = *p2; |
172 m->hash = hash; | 172 m->hash = hash; |
173 m->name = dostrdup(name); | 173 m->name = dostrdup(name); |
174 m->hasparams = false; | 174 m->hasparams = false; |
175 m->isspecial = false; | |
175 stringarray_init(&m->params); | 176 stringarray_init(&m->params); |
176 expansionitemarray_init(&m->expansion); | 177 expansionitemarray_init(&m->expansion); |
177 m->inuse = false; | 178 m->inuse = false; |
178 return m; | 179 return m; |
179 } | 180 } |