* src/include/Makefile.am src/include/cpstd.h

src/frontend/arg.c

@@ -8,10 +8,11 @@ Author: 1987 Jeffrey M. Hsu
       and prompt the user if necessary.
 */
 
-#include "ngspice.h"
-#include "fteinput.h"
-#include "cpdefs.h"
-#include "fteext.h"
+#include <ngspice.h>
+#include <fteinput.h>
+#include <cpdefs.h>
+#include <fteext.h>
+
 #include "arg.h"
 
 

src/frontend/display.c

@@ -3,15 +3,14 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 **********/
 
 
-#include "ngspice.h"
-#include "ftegraph.h"
-#include "ftedev.h"
-#include "fteinput.h"
-#include "cpdefs.h"     /* for VT_STRING */
-#include "ftedefs.h"        /* for mylog() */
-#include "display.h"
-
+#include <ngspice.h>
+#include <graph.h>
+#include <ftedev.h>
+#include <fteinput.h>
+#include <cpdefs.h>     /* for VT_STRING */
+#include <ftedefs.h>        /* for mylog() */
 
+#include "display.h"
 
 
 /* static declarations */

src/frontend/doplot.c

@@ -7,16 +7,15 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  * Plotting routines
  */
 
-#include "ngspice.h"
-#include "fteinput.h"
-#include "ftedbgra.h"
-#include "cpdefs.h"
-#include "plot.h"
-#include "ftedefs.h"
-#include "ftedev.h"
-#include "dvec.h"
-#include "fteparse.h"
-#include "fteext.h"
+#include <ngspice.h>
+#include <fteinput.h>
+#include <ftedbgra.h>
+#include <cpdefs.h>
+#include <plot.h>
+#include <fteparse.h>
+#include <fteext.h>
+#include <sim.h>
+
 #include "doplot.h"
 
 #include "plotting/agraf.h"

src/frontend/graphdb.c

@@ -6,10 +6,11 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
     Manage graph data structure.
 */
 
-#include "ngspice.h"
-#include "ftegraph.h"
-#include "ftedebug.h"
-#include "fteext.h"
+#include <ngspice.h>
+#include <graph.h>
+#include <ftedebug.h>
+#include <fteext.h>
+
 #include "graphdb.h"
 
 

src/frontend/plotcurv.c

@@ -7,12 +7,13 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  * Curve plotting routines and general (non-graphics) plotting things.
  */
 
-#include "ngspice.h"
-#include "cpdefs.h"
-#include "ftedefs.h"
-#include "dvec.h"
-#include "ftegraph.h"
-#include "ftedbgra.h"
+#include <ngspice.h>
+#include <cpdefs.h>
+#include <ftedefs.h>
+#include <dvec.h>
+#include <graph.h>
+#include <ftedbgra.h>
+
 #include "plotcurv.h"
 
 

src/frontend/plotting/graf.c

@@ -10,7 +10,7 @@ Author: 1988 Jeffrey M. Hsu
  */
 
 
-#include "ngspice.h"
+#include <ngspice.h>
 #include "cpdefs.h"		/* for VT_ */
 #include "cpextern.h"
 #include <plot.h>
@@ -18,7 +18,7 @@ Author: 1988 Jeffrey M. Hsu
 #include <dvec.h>		/* for struct dvec */
 #include "ftedefs.h"		/* for FTEextern.h and IPOINT{MIN,MAX} */
 #include "fteinput.h"
-#include "ftegraph.h"
+#include <graph.h>
 #include "ftedbgra.h"
 #include "ftedev.h"
 #include <terminal.h>

src/frontend/plotting/grid.c

@@ -7,12 +7,11 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
     Routines to draw the various sorts of grids -- linear, log, polar.
 */
 
-#include "ngspice.h"
-#include "ftegraph.h"
-#include "cpdefs.h"
-#include "ftedefs.h"
-#include "dvec.h"
-#include "fteparse.h"
+#include <ngspice.h>
+#include <graph.h>
+#include <cpdefs.h>
+#include <ftedefs.h>
+
 #include "grid.h"
 
 

src/frontend/plotting/plot5.c

@@ -2,10 +2,10 @@
 Copyright 1990 Regents of the University of California.  All rights reserved.
 **********/
 
-#include "ngspice.h"
-#include "ftegraph.h"
-#include "ftedev.h"
-#include "fteinput.h"
+#include <ngspice.h>
+#include <graph.h>
+#include <ftedev.h>
+
 #include "plot5.h"
 
 static FILE *plotfile;

src/frontend/plotting/x11.c

@@ -8,7 +8,7 @@ Author: 1988 Jeffrey M. Hsu
 */
 
 
-#include "ngspice.h"
+#include <ngspice.h>
 
 #ifndef X_DISPLAY_MISSING
 
@@ -16,13 +16,12 @@ Author: 1988 Jeffrey M. Hsu
 #  include <sys/types.h>  /* PN */
 #  include <unistd.h>     /* PN */
 
-
-#  include "ftegraph.h"
-#  include "ftedbgra.h"
-#  include "ftedev.h"
-#  include "fteinput.h"
-#  include "cpdefs.h"
-#  include "ftedefs.h"
+#  include <graph.h>
+#  include <ftedbgra.h>
+#  include <ftedev.h>
+#  include <fteinput.h>
+#  include <cpdefs.h>
+#  include <ftedefs.h>
 
 /* Added X11/ prefix to the next includes - ER */
 

src/frontend/points.c

@@ -3,19 +3,19 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group 
 **********/
 
-#include "ngspice.h"
-#include "cpdefs.h"
-#include "ftedefs.h"
-#include "dvec.h"
-#include "ftegraph.h"
-#include "ftedbgra.h"
+#include <ngspice.h>
+#include <cpdefs.h>
+#include <ftedefs.h>
+#include <dvec.h>
+#include <graph.h>
+#include <ftedbgra.h>
+
 #include "points.h"
 
 
-/* Returns the minimum and maximum values of a dvec. Returns a pointer to
- * static data.  If real is TRUE look at the real parts, otherwise the imag
- * parts.
- */
+/* Returns the minimum and maximum values of a dvec. Returns a pointer
+ * to static data.  If real is TRUE look at the real parts, otherwise
+ * the imag parts.  */
 
 
 

src/frontend/postcoms.c

@@ -7,14 +7,14 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  * Various post-processor commands having to do with vectors.
  */
 
-#include "ngspice.h"
-#include "cpdefs.h"
-#include "ftedefs.h"
-#include "fteparse.h"
-#include "dvec.h"
-#include "sim.h"
-#include "postcoms.h"
+#include <ngspice.h>
+#include <cpdefs.h>
+#include <ftedefs.h>
+#include <dvec.h>
+#include <sim.h>
+#include <plot.h>
 
+#include "postcoms.h"
 #include "completion.h"
 
 /* static declarations */

src/frontend/postsc.c

@@ -9,7 +9,7 @@ Author: 1988 Jeffrey M. Hsu
 
 #include "ngspice.h"
 #include "cpdefs.h"
-#include "ftegraph.h"
+#include "graph.h"
 #include "ftedbgra.h"
 #include "ftedev.h"
 #include "fteinput.h"

src/include/Makefile.am

@@ -15,18 +15,17 @@ noinst_HEADERS = \
 	distodef.h \
 	dvec.h \
 	fteconst.h \
-	ftedata.h \
 	ftedbgra.h \
 	ftedebug.h \
 	ftedefs.h \
 	ftedev.h \
 	fteext.h \
-	ftegraph.h \
 	ftehelp.h \
 	fteinp.h \
 	fteinput.h \
 	fteparse.h \
 	gendefs.h \
+	graph.h \
 	grid.h \
 	hlpdefs.h \
 	iferrmsg.h \

src/include/cpstd.h

@@ -35,24 +35,6 @@ extern char *printnum();
 extern int cp_numdgt;
 extern void fatal();
 
-/* extern void setenv(); */
-
 extern void cp_printword();
 
-/* Externs from wlist.c */
-
-extern char **wl_mkvec();
-extern char *wl_flatten();
-extern int wl_length();
-extern void wl_free();
-extern void wl_print();
-extern void wl_sort();
-extern wordlist *wl_append();
-extern wordlist *wl_build();
-extern wordlist *wl_copy();
-extern wordlist *wl_range();
-extern wordlist *wl_nthelem();
-extern wordlist *wl_reverse();
-extern wordlist *wl_splice();
-
 #endif /* _STD_H_*/

src/include/dvec.h

@@ -62,4 +62,10 @@ struct dvec {
 #define isreal(v)   ((v)->v_flags & VF_REAL)
 #define iscomplex(v)    ((v)->v_flags & VF_COMPLEX)
 
+/* list of data vectors being displayed */
+struct dveclist {
+    struct dvec *vector;
+    struct dveclist *next;
+};
+
 #endif

src/include/fteconst.h

@@ -1,18 +0,0 @@
-/**********
-Copyright 1990 Regents of the University of California.  All rights reserved.
-Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
-**********/
-
-/* Vector types. */
-
-#ifndef _CONSTANTS_
-#define _CONSTANTS_
-
-/* FIXME: Adjust all callers to use new header files */
-#warning "Please use either sim.h, grid.h or plot.h instead of fteconst.h"
-#include "sim.h"
-#include "grid.h"
-#include "plot.h"
-
-#endif
-

src/include/ftedata.h

@@ -1,19 +0,0 @@
-
-/* RCS Info: $Revision$ on $Date$
- *         $Source$
- * Copyright (c) 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
- *
- * Structures used for representing spice data in nutmeg.
- */
-
-#ifndef FTEdata_h
-#define FTEdata_h
-
-#include "cpstd.h"      /* for struct complex */
-
-/* FIXME: Adjust all callers to use the new header files. */
-#warning "Please use either dvec.h or plot.h instead of ftedata.h"
-
-#include "dvec.h"
-#include "plot.h"
-#endif /* FTEdata_h */

src/include/fteinput.h

@@ -4,8 +4,6 @@ Author: 1988 Jeffrey M. Hsu
 **********/
 
 /*
-    $Header$
-
     Defs to use the Input routine.
 
     char_option is used by the lexer and the command interpreter
@@ -22,7 +20,7 @@ Author: 1988 Jeffrey M. Hsu
 
 
 #include <stdio.h>
-#include "ftegraph.h"
+#include "graph.h"
 
 typedef enum {
     error_option,       /* a reply option only */

src/include/ftegraph.h → src/include/graph.h

@@ -7,10 +7,9 @@ Author: 1988 Jeffrey M. Hsu
     This file contains the graph structure.
 */
 
-#ifndef _GRAPH_H_
-#define _GRAPH_H_
+#ifndef _GRAPH_H
+#define _GRAPH_H
 
-#include "sim.h"
 #include "grid.h"
 #include "plot.h"
 #include "dvec.h"            /* for struct dvec */
@@ -19,12 +18,6 @@ Author: 1988 Jeffrey M. Hsu
 
 #define NUMCOLORS 20
 
-/* list of data vectors being displayed */
-struct dveclist {
-    struct dvec *vector;
-    struct dveclist *next;
-};
-
 typedef struct graph {
     int graphid;
     struct dveclist *plotdata;  /* normalized data */
@@ -142,4 +135,4 @@ typedef struct graph {
 
 #define rnd(x)  (int) ((x)+0.5)
 
-#endif  /* notdef _GRAPH_H_ */
+#endif

src/include/ifsim.h

@@ -6,13 +6,6 @@ Author: 1986 Thomas L. Quarles
 #ifndef IFSIMULATOR
 #define IFSIMULATOR
 
-/*
- * We don't always have access to an ANSI C compiler yet, so we
- * make the following convenient definition
- */
-
-
-/* Removed code for non STDC compilers  Paolo Nenzi 2000*/
 
 /* 
  * structure:   IFparm
@@ -321,7 +314,6 @@ typedef struct sIFsimulator {
     char *description;              /* description of this simulator */
     char *version;                  /* version or revision level of simulator*/
 
-#ifdef __STDC__
     int ((*newCircuit)(void **));  
                                     /* create new circuit */
     int ((*deleteCircuit)(void *));
@@ -383,42 +375,6 @@ typedef struct sIFsimulator {
 
     int ((*doAnalyses)(void*,int,void*));          
     char *((*nonconvErr)(void*,char *)); /* return nonconvergence error */
-#else
-    int ((*newCircuit)());          /* create new circuit */
-    int ((*deleteCircuit)());       /* destroy old circuit's data structures */
-
-    int ((*newNode)());             /* create new node */
-    int ((*groundNode)());          /* create ground node */
-    int ((*bindNode)());            /* bind a node to a terminal */
-    int ((*findNode)());            /* find a node by name */
-    int ((*instToNode)());          /* find the node attached to a terminal */
-    int ((*setNodeParm)());         /* set a parameter on a node */
-    int ((*askNodeQuest)());        /* ask a question about a node */
-    int ((*deleteNode)());          /* delete a node from the circuit */
-
-    int ((*newInstance)());         /* create new instance */
-    int ((*setInstanceParm)());     /* set a parameter on an instance */
-    int ((*askInstanceQuest)());    /* ask a question about an instance */
-    int ((*findInstance)());        /* find a specific instance */
-    int ((*deleteInstance)());      /* delete an instance from the circuit */
-
-    int ((*newModel)());            /* create new model */
-    int ((*setModelParm)());        /* set a parameter on a model */
-    int ((*askModelQuest)());       /* ask a questions about a model */
-    int ((*findModel)());           /* find a specific model */
-    int ((*deleteModel)());         /* delete a model from the circuit*/
-
-    int ((*newTask)());             /* create a new task */
-    int ((*newAnalysis)());         /* create new analysis within a task */
-    int ((*setAnalysisParm)());     /* set a parameter on an analysis  */
-    int ((*askAnalysisQuest)());    /* ask a question about an analysis */
-    int ((*findAnalysis)());        /* find a specific analysis */
-    int ((*findTask)());            /* find a specific task */
-    int ((*deleteTask)());          /* delete a task */
-
-    int ((*doAnalyses)());          /* run a specified task */
-    char *((*nonconvErr)());	    /* return nonconvergence error */
-#endif /* STDC */
 
     int numDevices;                 /* number of device types supported */
     IFdevice **devices;             /* array of device type descriptors */
@@ -445,7 +401,6 @@ typedef struct sIFsimulator {
  */
 
 typedef struct sIFfrontEnd {
-#ifdef __STDC__
     int ((*IFnewUid)(void*,IFuid*,IFuid,char*,int,void**));    
                             /* create a new UID in the circuit */
     int ((*IFdelUid)(void*,IFuid,int));
@@ -478,23 +433,6 @@ typedef struct sIFfrontEnd {
                             /* end nested domain */
     int ((*OUTattributes)(void *,IFuid*,int,IFvalue*));
                             /* specify output attributes of node */
-#else /* not STDC */
-    int ((*IFnewUid)());    /* create a new UID in the circuit */
-    int ((*IFdelUid)());    /* create a new UID in the circuit */
-    int ((*IFpauseTest)()); /* should we stop now? */
-    double ((*IFseconds)());   /* what time is it? */
-    int ((*IFerror)());     /* output an error or warning message */
-    int ((*OUTpBeginPlot)());   /* start pointwise output plot */
-    int ((*OUTpData)());        /* data for pointwise plot */
-    int ((*OUTwBeginPlot)());   /* start windowed output plot */
-    int ((*OUTwReference)());   /* independent vector for windowed plot */
-    int ((*OUTwData)());        /* data for windowed plot */
-    int ((*OUTwEnd)());         /* signal end of windows */
-    int ((*OUTendPlot)());      /* end of plot */
-    int ((*OUTbeginDomain)());  /* start nested domain */
-    int ((*OUTendDomain)());    /* end nested domain */
-    int ((*OUTattributes)());      /* specify output attributes of node */
-#endif /* STDC */
 } IFfrontEnd;
 
 /* flags for the first argument to IFerror */

src/include/wordlist.h

@@ -11,4 +11,18 @@ struct wordlist {
 
 typedef struct wordlist wordlist;
 
+extern char **wl_mkvec();
+extern char *wl_flatten();
+extern int wl_length();
+extern void wl_free();
+extern void wl_print();
+extern void wl_sort();
+extern wordlist *wl_append();
+extern wordlist *wl_build();
+extern wordlist *wl_copy();
+extern wordlist *wl_range();
+extern wordlist *wl_nthelem();
+extern wordlist *wl_reverse();
+extern wordlist *wl_splice();
+
 #endif