From d154d16449e746bbfdd751d48a049d27ef7969aa Mon Sep 17 00:00:00 2001
From: pnenzi <pnenzi>
Date: Wed, 6 Aug 2003 10:53:38 +0000
Subject: [PATCH] Corrected errors I made in adding tclspice code.

---
 src/frontend/hpgl.c            |  2 +-
 src/frontend/outitf.c          | 14 +++++++-------
 src/frontend/vectors.c         |  2 +-
 src/main.c                     |  6 +++---
 src/spicelib/analysis/acan.c   |  1 +
 src/spicelib/analysis/dctran.c |  1 +
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/frontend/hpgl.c b/src/frontend/hpgl.c
index e248b2073..3ecd2c299 100644
--- a/src/frontend/hpgl.c
+++ b/src/frontend/hpgl.c
@@ -30,7 +30,7 @@ Author: Jim Groves
 
 
 
-#include "spice.h"
+#include "ngspice.h"
 #include "cpdefs.h"
 #include "graph.h"
 #include "ftedbgra.h"
diff --git a/src/frontend/outitf.c b/src/frontend/outitf.c
index 05b774faa..e396386f2 100644
--- a/src/frontend/outitf.c
+++ b/src/frontend/outitf.c
@@ -57,7 +57,6 @@ static bool getSpecial(dataDesc *desc, runDesc *run, IFvalue *val);
 static void freeRun(runDesc *run);
 
 
-
 #define DOUBLE_PRECISION    15
 
 
@@ -78,8 +77,7 @@ extern bool ft_getOutReq (FILE **fpp, struct plot **plotp, bool *binp, char *nam
 int
 OUTpBeginPlot(void *circuitPtr, void *analysisPtr, IFuid analName, IFuid refName, int refType, int numNames, IFuid *dataNames, int dataType, void **plotPtr)
 {
-    char *name;
-    
+    char *name;    
 #ifdef PARALLEL_ARCH
 if (ARCHme != 0) return(OK);
 #endif /* PARALLEL_ARCH */
@@ -121,8 +119,7 @@ beginPlot(void *analysisPtr, void *circuitPtr, char *cktName, char *analName, ch
     char *ch, tmpname[BSIZE_SP];
     bool saveall  = TRUE;
     bool savealli = FALSE;
-    char *an_name;
-   
+    char *an_name;   
     /*to resume a run saj
     *All it does is reassign the file pointer and return (requires *runp to be NULL if this is not needed)
     */
@@ -133,6 +130,7 @@ beginPlot(void *analysisPtr, void *circuitPtr, char *cktName, char *analName, ch
       
     } else {
     /*end saj*/
+    
     /* Check to see if we want to print informational data. */
     if (cp_getvar("printinfo", VT_BOOL, (char *) &printinfo))
 	fprintf(cp_err, "(debug printing enabled)\n");
@@ -355,7 +353,7 @@ beginPlot(void *analysisPtr, void *circuitPtr, char *cktName, char *analName, ch
 	if (refName)
 	    run->runPlot->pl_ndims = 1;
     }
-
+   }
     return (OK);
 }
 
@@ -1098,7 +1096,9 @@ OUTstopnow(void)
 static struct mesg {
         char *string;
         long flag;
-} msgs[] = {
+} 
+
+msgs[] = {
         { "Warning", ERR_WARNING } ,
         { "Fatal error", ERR_FATAL } ,
         { "Panic", ERR_PANIC } ,
diff --git a/src/frontend/vectors.c b/src/frontend/vectors.c
index 110e0801b..6480df751 100644
--- a/src/frontend/vectors.c
+++ b/src/frontend/vectors.c
@@ -7,7 +7,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  * Routines for dealing with the vector database.
  */
 
-#include <spice.h>
+#include <ngspice.h>
 #include <cpdefs.h>
 #include <ftedefs.h>
 #include <dvec.h>
diff --git a/src/main.c b/src/main.c
index fddd37606..112b14db3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -30,7 +30,7 @@
 #include <misc/getopt.h>
 #include <frontend/resource.h>
 #include <frontend/variable.h>
-#include "frontend/display.h" /* va */
+//#include "frontend/display.h" /* va */
 
 /* saj xspice headers */
 #ifdef XSPICE
@@ -60,7 +60,7 @@ bool ft_intrpt = FALSE;     /* Set by the (void) signal handlers. */
 bool ft_setflag = FALSE;    /* Don't abort after an interrupt. */
 char *ft_rawfile = "rawspice.raw";
 
-bool oflag = FALSE;         /* Output über redefinierte Funktionen */
+bool oflag = FALSE;         /* Output über redefinierte Funktionen */
 FILE *flogp;  // hvogt 15.12.2001
 
 /* Frontend and circuit options */
@@ -480,7 +480,7 @@ main(int argc, char **argv)
 		    shutdown (EXIT_BAD);
 		}
 #endif		
-//    *** Log-File öffnen *******
+//    *** Log-File öffnen *******
                 if (!(flogp = fopen(buf, "w"))) {
                       perror(buf);
                       shutdown(EXIT_BAD);                    
diff --git a/src/spicelib/analysis/acan.c b/src/spicelib/analysis/acan.c
index 809c5eb2b..e6138b21d 100644
--- a/src/spicelib/analysis/acan.c
+++ b/src/spicelib/analysis/acan.c
@@ -17,6 +17,7 @@ Modified 2001: AlansFixes
 #include "evtproto.h"
 #include "ipctiein.h"
 /* gtri - end - wbk */
+#endif
 
 #ifdef HAS_WINDOWS
 void SetAnalyse( char * Analyse, int Percent);
diff --git a/src/spicelib/analysis/dctran.c b/src/spicelib/analysis/dctran.c
index a5b49421a..7352cdb8e 100644
--- a/src/spicelib/analysis/dctran.c
+++ b/src/spicelib/analysis/dctran.c
@@ -28,6 +28,7 @@ Modified: 2000  AlansFixes
 
 #ifdef CLUSTER
 #include "cluster.h"
+#endif
 
 #ifdef HAS_WINDOWS    /* hvogt 10.03.99, nach W. Mues */
 void SetAnalyse( char * Analyse, int Percent);