diff --git a/ChangeLog b/ChangeLog index 9317fa528..4950687b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-10-16 Robert Larice + * src/frontend/inp.c , + * src/frontend/nutinp.c , + * src/include/fteext.h : + collect inp_deckcopy() inp_subcktexpand() in "subckt.h" + 2010-10-16 Robert Larice * src/frontend/commands.c , * src/include/fteext.h : diff --git a/src/frontend/inp.c b/src/frontend/inp.c index 908b993eb..ed3a68205 100644 --- a/src/frontend/inp.c +++ b/src/frontend/inp.c @@ -30,6 +30,7 @@ $Id$ #include "breakp2.h" #include "../misc/util.h" /* dirname() */ #include "../misc/mktemp.h" +#include "subckt.h" #include "spiceif.h" #include "error.h" /* controlled_exit() */ diff --git a/src/frontend/nutinp.c b/src/frontend/nutinp.c index dadc8362a..c5ccf8193 100644 --- a/src/frontend/nutinp.c +++ b/src/frontend/nutinp.c @@ -16,6 +16,7 @@ $Id$ #include "nutinp.h" #include "variable.h" #include "../misc/mktemp.h" +#include "subckt.h" /* The routine to source a spice input deck. We read the deck in, take out * the front-end commands, and create a CKT structure. Also we filter out diff --git a/src/include/fteext.h b/src/include/fteext.h index be14fdd64..1bb4b0565 100644 --- a/src/include/fteext.h +++ b/src/include/fteext.h @@ -375,11 +375,6 @@ extern void if_setparam_model(CKTcircuit *ckt, char **name, char *val ); extern void if_setparam(CKTcircuit *ckt, char **name, char *param, struct dvec *val, int do_model); extern struct variable *if_getstat(CKTcircuit *ckt, char *name); -/* subckt.c */ - -extern struct line *inp_deckcopy(struct line *deck); -extern struct line *inp_subcktexpand(struct line *deck); - /* typesdef.c */ extern void com_dftype(wordlist *);