From 1d62b41bfa0527ab3b16951bfed799d3a96d82e8 Mon Sep 17 00:00:00 2001 From: rlar Date: Sat, 9 Oct 2010 12:49:34 +0000 Subject: [PATCH] collect cp_* prototypes / extern-declarations in "cpextern.h" --- ChangeLog | 17 +++++++++++++++++ src/frontend/com_cdump.c | 2 +- src/frontend/com_chdir.c | 2 +- src/frontend/com_dump.c | 2 +- src/frontend/com_echo.c | 2 +- src/frontend/com_ghelp.c | 2 +- src/frontend/com_rehash.c | 2 +- src/frontend/com_setscale.c | 2 +- src/frontend/com_shell.c | 1 + src/frontend/com_shift.c | 2 +- src/frontend/com_state.c | 2 +- src/frontend/parser/unixcom.c | 1 + src/frontend/streams.c | 1 + src/frontend/streams.h | 13 ------------- src/frontend/variable.c | 2 +- 15 files changed, 30 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 486a99066..8778b7ddf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2010-10-09 Robert Larice + * src/frontend/com_cdump.c , + * src/frontend/com_chdir.c , + * src/frontend/com_dump.c , + * src/frontend/com_echo.c , + * src/frontend/com_ghelp.c , + * src/frontend/com_rehash.c , + * src/frontend/com_setscale.c , + * src/frontend/com_shell.c , + * src/frontend/com_shift.c , + * src/frontend/com_state.c , + * src/frontend/parser/unixcom.c , + * src/frontend/streams.c , + * src/frontend/streams.h , + * src/frontend/variable.c : + collect cp_* prototypes / extern-declarations in "cpextern.h" + 2010-10-09 Robert Larice * src/ciderlib/input/dopset.c : additional #includes for prototype visibility diff --git a/src/frontend/com_cdump.c b/src/frontend/com_cdump.c index c066bef27..a3f7a8d35 100644 --- a/src/frontend/com_cdump.c +++ b/src/frontend/com_cdump.c @@ -3,7 +3,7 @@ #include #include "control.h" -#include "streams.h" +#include "cpextern.h" #include "com_cdump.h" diff --git a/src/frontend/com_chdir.c b/src/frontend/com_chdir.c index 83e75e3f5..fb32475c4 100644 --- a/src/frontend/com_chdir.c +++ b/src/frontend/com_chdir.c @@ -13,7 +13,7 @@ #include "com_chdir.h" #include "quote.h" -#include "streams.h" +#include "cpextern.h" void diff --git a/src/frontend/com_dump.c b/src/frontend/com_dump.c index 25caa31b2..a43f3eae8 100644 --- a/src/frontend/com_dump.c +++ b/src/frontend/com_dump.c @@ -5,7 +5,7 @@ #include #include "circuits.h" #include "com_dump.h" -#include "streams.h" +#include "cpextern.h" #include "fteext.h" diff --git a/src/frontend/com_echo.c b/src/frontend/com_echo.c index 91d1583ae..6ba10d4fd 100644 --- a/src/frontend/com_echo.c +++ b/src/frontend/com_echo.c @@ -10,7 +10,7 @@ #include "com_echo.h" #include "quote.h" -#include "streams.h" +#include "cpextern.h" void com_echo(wordlist *wlist) diff --git a/src/frontend/com_ghelp.c b/src/frontend/com_ghelp.c index 21a32a91e..dc9a48de4 100644 --- a/src/frontend/com_ghelp.c +++ b/src/frontend/com_ghelp.c @@ -5,7 +5,7 @@ #include #include "variable.h" -#include "streams.h" +#include "cpextern.h" #include "cpextern.h" #include #endif diff --git a/src/frontend/com_rehash.c b/src/frontend/com_rehash.c index b18895e41..f7804a8c7 100644 --- a/src/frontend/com_rehash.c +++ b/src/frontend/com_rehash.c @@ -8,7 +8,7 @@ #include #include "com_rehash.h" -#include "streams.h" +#include "cpextern.h" #include "control.h" #include "parser/unixcom.h" diff --git a/src/frontend/com_setscale.c b/src/frontend/com_setscale.c index 7418f30c1..576691f4a 100644 --- a/src/frontend/com_setscale.c +++ b/src/frontend/com_setscale.c @@ -4,7 +4,7 @@ #include "com_setscale.h" #include "quote.h" -#include "streams.h" +#include "cpextern.h" #include "vectors.h" #include "plotting/plotting.h" #include "plotting/pvec.h" diff --git a/src/frontend/com_shell.c b/src/frontend/com_shell.c index 625f9ed3f..f4efeb869 100644 --- a/src/frontend/com_shell.c +++ b/src/frontend/com_shell.c @@ -8,6 +8,7 @@ #include #include "com_shell.h" +#include "streams.h" #include "cpextern.h" /* Fork a shell. */ diff --git a/src/frontend/com_shift.c b/src/frontend/com_shift.c index c5bb7eef2..5dcc4b835 100644 --- a/src/frontend/com_shift.c +++ b/src/frontend/com_shift.c @@ -10,7 +10,7 @@ #include "com_shift.h" #include "variable.h" -#include "streams.h" +#include "cpextern.h" /* Shift a list variable, by default argv, one to the left (or more if diff --git a/src/frontend/com_state.c b/src/frontend/com_state.c index cb8beb128..1e80ed651 100644 --- a/src/frontend/com_state.c +++ b/src/frontend/com_state.c @@ -7,7 +7,7 @@ #include "circuits.h" #include "com_state.h" -#include "streams.h" +#include "cpextern.h" #include "plotting/plotting.h" diff --git a/src/frontend/parser/unixcom.c b/src/frontend/parser/unixcom.c index 83de8b3d3..ab449511a 100644 --- a/src/frontend/parser/unixcom.c +++ b/src/frontend/parser/unixcom.c @@ -11,6 +11,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group #include "ngspice.h" #include "cpdefs.h" #include "unixcom.h" +#include "../frontend/streams.h" #ifdef HAVE_VFORK_H diff --git a/src/frontend/streams.c b/src/frontend/streams.c index edcb7dd49..bf17f9e80 100644 --- a/src/frontend/streams.c +++ b/src/frontend/streams.c @@ -11,6 +11,7 @@ #include "variable.h" #include "terminal.h" #include "quote.h" +#include "cpextern.h" #include "streams.h" bool cp_debug = FALSE; diff --git a/src/frontend/streams.h b/src/frontend/streams.h index 0600b2292..c07c10f7a 100644 --- a/src/frontend/streams.h +++ b/src/frontend/streams.h @@ -9,19 +9,6 @@ #include #include -extern bool cp_debug; -extern char cp_amp; -extern char cp_gt; -extern char cp_lt; -extern FILE *cp_in; -extern FILE *cp_out; -extern FILE *cp_err; -extern FILE *cp_curin; -extern FILE *cp_curout; -extern FILE *cp_curerr; - -void cp_ioreset(void); void fixdescriptors(void); -wordlist * cp_redirect(wordlist *wl); #endif /* STREAMS_H */ diff --git a/src/frontend/variable.c b/src/frontend/variable.c index 81e49a450..ac1042d9b 100644 --- a/src/frontend/variable.c +++ b/src/frontend/variable.c @@ -20,7 +20,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group #include "circuits.h" #include "com_history.h" #include "quote.h" -#include "streams.h" +#include "cpextern.h" #include "variable.h"