diff --git a/ChangeLog b/ChangeLog index 6a536dc97..40daac02f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ +2009-04-26 Holger Vogt + + 2009-04-25 Holger Vogt - * configure.in: NGSPICEDATADIR set to $dprefix/share/ngspice + * configure.in, visualc/include/config.h: NGSPICEDATADIR set to $dprefix/share/ngspice 2009-04-23 Holger Vogt * measure.c, inpcom.c, : winmessage() header added diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c index ec8865aec..824917f29 100644 --- a/src/frontend/numparam/xpressn.c +++ b/src/frontend/numparam/xpressn.c @@ -397,7 +397,12 @@ define (tdico * dico, { scopy (v, t); sadd (v, ": cannot redefine"); - err = message (dico, v); + /* suppress error message, resulting from multiple definition of + symbols (devices) in .model lines with same name, but in different subcircuits. + Subcircuit expansion is o.k., we have to deal with this numparam + behaviour later. (H. Vogt 090426) + */ + /*err = message (dico, v);*/ } } Strrem(v);