From 894dcead3528c6b1ae3640086c69e1402c7a5a61 Mon Sep 17 00:00:00 2001 From: rlar Date: Sat, 16 Oct 2010 15:50:32 +0000 Subject: [PATCH] collect if_inpdeck() if_run() if_cktfree() if_dump() if_option() in "spiceif.h" --- ChangeLog | 11 +++++++++++ src/frontend/com_dump.c | 1 + src/frontend/inp.c | 1 + src/frontend/mw_coms.c | 1 + src/frontend/options.c | 1 + src/frontend/runcoms.c | 1 + src/frontend/runcoms2.c | 1 + src/include/fteext.h | 5 ----- src/main.c | 1 + 9 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10c4c791f..46fc1f9dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2010-10-16 Robert Larice + * src/frontend/com_dump.c , + * src/frontend/inp.c , + * src/frontend/mw_coms.c , + * src/frontend/options.c , + * src/frontend/runcoms.c , + * src/frontend/runcoms2.c , + * src/include/fteext.h , + * src/main.c : + collect if_inpdeck() if_run() if_cktfree() if_dump() if_option() in "spiceif.h" + 2010-10-16 Robert Larice * src/frontend/misccoms.c , * src/frontend/plotting/plotcurv.c , diff --git a/src/frontend/com_dump.c b/src/frontend/com_dump.c index a43f3eae8..cf9441bce 100644 --- a/src/frontend/com_dump.c +++ b/src/frontend/com_dump.c @@ -7,6 +7,7 @@ #include "com_dump.h" #include "cpextern.h" #include "fteext.h" +#include "spiceif.h" void diff --git a/src/frontend/inp.c b/src/frontend/inp.c index a417db23d..908b993eb 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 "spiceif.h" #include "error.h" /* controlled_exit() */ #ifdef XSPICE diff --git a/src/frontend/mw_coms.c b/src/frontend/mw_coms.c index eb94025ab..7e2cbbd7e 100644 --- a/src/frontend/mw_coms.c +++ b/src/frontend/mw_coms.c @@ -13,6 +13,7 @@ #include "mw_coms.h" #include "variable.h" #include "runcoms.h" +#include "spiceif.h" /* Clears ckt and removes current circ. form database */ diff --git a/src/frontend/options.c b/src/frontend/options.c index 108ae754f..4c815c2ff 100644 --- a/src/frontend/options.c +++ b/src/frontend/options.c @@ -21,6 +21,7 @@ $Id$ #include "options.h" #include "variable.h" #include "control.h" +#include "spiceif.h" /* static declarations */ diff --git a/src/frontend/runcoms.c b/src/frontend/runcoms.c index 1ebed7ebe..c49dd01d9 100644 --- a/src/frontend/runcoms.c +++ b/src/frontend/runcoms.c @@ -20,6 +20,7 @@ $Id$ #include "completion.h" #include "runcoms.h" #include "variable.h" +#include "spiceif.h" #ifdef XSPICE /* gtri - add - 12/12/90 - wbk - include ipc stuff */ diff --git a/src/frontend/runcoms2.c b/src/frontend/runcoms2.c index 672f8ab72..f1fb394cc 100644 --- a/src/frontend/runcoms2.c +++ b/src/frontend/runcoms2.c @@ -21,6 +21,7 @@ $Id$ #include "variable.h" #include "breakp2.h" #include "plotting/graf.h" +#include "spiceif.h" #include "inpdefs.h" diff --git a/src/include/fteext.h b/src/include/fteext.h index daf1dbc32..ae191f572 100644 --- a/src/include/fteext.h +++ b/src/include/fteext.h @@ -371,16 +371,11 @@ extern int main(int argc, char **argv); extern bool if_tranparams(struct circ *ci, double *start, double *stop, double *step); extern char *if_errstring(int code); -extern CKTcircuit *if_inpdeck(struct line *deck, INPtables **tab); -extern int if_run(CKTcircuit *t, char *what, wordlist *args, INPtables *tab); extern int if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab); extern struct variable *(*if_getparam)(CKTcircuit *ckt, char** name, char* param, int ind, int do_model); extern struct variable * nutif_getparam(CKTcircuit *ckt, char **name, char *param, int ind, int do_model); extern struct variable *spif_getparam(CKTcircuit *ckt, char **name, char *param, int ind, int do_model); extern struct variable *spif_getparam_special(CKTcircuit *ckt, char **name, char *param, int ind, int do_model); -extern void if_cktfree(CKTcircuit *ckt, INPtables *tab); -extern void if_dump(CKTcircuit *ckt, FILE *file); -extern int if_option(CKTcircuit *ckt, char *name, enum cp_types type, void *value); extern void if_setndnames(char *line); 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); diff --git a/src/main.c b/src/main.c index eb95b91c1..0a9da75fb 100644 --- a/src/main.c +++ b/src/main.c @@ -55,6 +55,7 @@ extern int rl_catch_signals; /* missing from editline/readline.h */ #else #include "misc/getopt_bsd.h" #endif +#include "frontend/spiceif.h" #include "frontend/resource.h" #include "frontend/variable.h" #include "frontend/display.h" /* added by SDB to pick up Input() fcn */