rename spicelib/parser/inp.h to inpxx.h

since we have another "inp.h" in src/frontend

src/spicelib/parser/Makefile.am

@@ -67,7 +67,7 @@ libinp_la_SOURCES = \
 		inptyplk.c	\
 		ptfuncs.c	\
 		sperror.c	\
-		inp.h
+		inpxx.h
 
 $(srcdir)/inpptree.c : inpptree-parser.c
 inpptree-parser.c inpptree-parser.h : inpptree-parser.y

src/spicelib/parser/ifeval.c

@@ -10,7 +10,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "ngspice/iferrmsg.h"
 #include "ngspice/inpptree.h"
-#include "inp.h"
+#include "inpxx.h"
 #include "ngspice/cktdefs.h"
 
 /* Uncomment to allow tracing */

src/spicelib/parser/ifnewuid.c

@@ -24,7 +24,7 @@ extern int vasprintf(char **out, const char *fmt, va_list ap);
 #include "ngspice/ifsim.h"
 #include "ngspice/iferrmsg.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 
 /* va: we should use tmalloc, whith also makes failure test */

src/spicelib/parser/inp2b.c

@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 #include "ngspice/cktdefs.h"
 
 void INP2B(CKTcircuit *ckt, INPtables * tab, card * current)

src/spicelib/parser/inp2c.c

@@ -8,7 +8,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2C(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inp2d.c

@@ -10,7 +10,7 @@ Modified: 2001 Paolo Nenzi (Cider Integration)
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2D(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inp2dot.c

@@ -10,7 +10,7 @@ Modified: 2000 AlansFixes
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 #include "ngspice/cpdefs.h"
 #include "ngspice/tskdefs.h"
 

src/spicelib/parser/inp2e.c

@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2E(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inp2f.c

@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2F(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inp2g.c

@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2G(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inp2h.c

@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2H(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inp2i.c

@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2I(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inp2j.c

@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2J(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inp2k.c

@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2K(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inp2l.c

@@ -8,7 +8,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2L(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inp2m.c

@@ -10,7 +10,7 @@ Modified: 2001 Paolo Nenzi (Cider Integration)
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void
 INP2M (CKTcircuit *ckt, INPtables * tab, card * current)

src/spicelib/parser/inp2n.c

@@ -14,7 +14,7 @@ University of Science and Technology of China
 #include "../devices/ndev/ndevdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2N(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inp2o.c

@@ -9,7 +9,7 @@ Author: 1990 Jaijeet S. Roychowdhury
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 
 void INP2O(CKTcircuit *ckt, INPtables * tab, card * current)

src/spicelib/parser/inp2p.c

@@ -9,7 +9,7 @@ Author: 1992 Charles Hough
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void
 INP2P(

src/spicelib/parser/inp2q.c

@@ -9,7 +9,7 @@ Modified: 2001 Paolo Nenzi (Cider Integration)
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
 {

src/spicelib/parser/inp2r.c

@@ -12,7 +12,7 @@ Remarks:  This code is based on a version written by Serban Popescu which
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 /* undefine to add tracing to this file */
 /* #define TRACE */

src/spicelib/parser/inp2s.c

@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2S(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inp2t.c

@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2T(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inp2u.c

@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2U(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inp2v.c

@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2V(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inp2w.c

@@ -9,7 +9,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2W(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inp2y.c

@@ -9,7 +9,7 @@ Author: 1992 Charles Hough
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void
 INP2Y(

src/spicelib/parser/inp2z.c

@@ -16,7 +16,7 @@ Author: 1988 Thomas L. Quarles
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpmacs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 void INP2Z(CKTcircuit *ckt, INPtables * tab, card * current)
 {

src/spicelib/parser/inpaname.c

@@ -17,7 +17,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "ngspice/ifsim.h"
 #include "ngspice/iferrmsg.h"
-#include "inp.h"
+#include "inpxx.h"
 
 int
 INPaName(char *parm, IFvalue * val, CKTcircuit *ckt, int *dev, char *devnam,

src/spicelib/parser/inpapnam.c

@@ -9,7 +9,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/iferrmsg.h"
 #include "ngspice/cpdefs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 int
 INPapName(CKTcircuit *ckt, int type, JOB *analPtr, char *parmname,

src/spicelib/parser/inpcfix.c

@@ -9,7 +9,7 @@ Author: 1985 Thomas L. Quarles
 #include <ctype.h>
 #include "ngspice/fteext.h"
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 
 void INPcaseFix(register char *string)

src/spicelib/parser/inpdomod.c

@@ -6,7 +6,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/ngspice.h"
 #include "ngspice/iferrmsg.h"
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 /*--------------------------------------------------------------
  * This fcn takes the model card & examines it.  Depending upon

src/spicelib/parser/inpdpar.c

@@ -18,7 +18,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/iferrmsg.h"
 #include "ngspice/cpdefs.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 char *INPdevParse(char **line, CKTcircuit *ckt, int dev, GENinstance *fast,
 		  double *leading, int *waslead, INPtables * tab)

src/spicelib/parser/inperrc.c

@@ -8,7 +8,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/ngspice.h"
 #include <stdio.h>
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 
 char *INPerrCat(char *a, char *b)

src/spicelib/parser/inperror.c

@@ -23,7 +23,7 @@ extern int vasprintf(char **out, const char *fmt, va_list ap);
 #include "ngspice/ifsim.h"
 #include "ngspice/iferrmsg.h"
 #include "ngspice/sperror.h"
-#include "inp.h"
+#include "inpxx.h"
 
 char *INPerror(int type)
 {

src/spicelib/parser/inpeval.c

@@ -7,7 +7,7 @@ Author: 1985 Thomas L. Quarles
 #include <stdio.h>
 #include <ctype.h>
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 double INPevaluate(char **line, int *error, int gobble)
 		/* non-zero to gobble rest of token, zero to leave it alone */

src/spicelib/parser/inpfindl.c

@@ -12,7 +12,7 @@ Modified: 1999 Paolo Nenzi - Now we can use a two digits level code -
 
 #include "ngspice/ngspice.h"
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 char *INPfindLev(char *line, int *level)
 {

src/spicelib/parser/inpfindv.c

@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 char *INPfindVer(char *line, char *version)
 {

src/spicelib/parser/inpgmod.c

@@ -9,7 +9,7 @@ Modified: 2001 Paolo Nenzi (Cider Integration)
 #include "ngspice/ifsim.h"
 #include "ngspice/cpstd.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 #include <errno.h>
 
 #ifdef CIDER

src/spicelib/parser/inpgstr.c

@@ -11,7 +11,7 @@ Author: 1985 Thomas L. Quarles
 #include <stdio.h>
 #include "ngspice/iferrmsg.h"
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 int INPgetStr(char **line, char **token, int gobble)
 				/* eat non-whitespace trash AFTER token? */

src/spicelib/parser/inpgtitl.c

@@ -14,7 +14,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/iferrmsg.h"
 #include "ngspice/cpstd.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 int INPgetTitle(CKTcircuit **ckt, card ** data)
 {

src/spicelib/parser/inpgtok.c

@@ -16,7 +16,7 @@ Modified: 2000 AlansFixes
 #include "ngspice/ngspice.h"
 #include "ngspice/iferrmsg.h"
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 /*-------------------------------------------------------------------
  * INPgetTok -- this fcn extracts a generic input token from 

src/spicelib/parser/inpgval.c

@@ -8,7 +8,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/ifsim.h"
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpptree.h"
-#include "inp.h"
+#include "inpxx.h"
 
 IFvalue *INPgetValue(CKTcircuit *ckt, char **line, int type, INPtables * tab)
 {

src/spicelib/parser/inpkmods.c

@@ -8,7 +8,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/ngspice.h"
 #include <stdio.h>
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 
 extern INPmodel *modtab;

src/spicelib/parser/inplist.c

@@ -14,7 +14,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/ngspice.h"
 #include <stdio.h>
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 extern void INPlist(FILE *file, card *deck, int type);  /* nowhere used function */
 

src/spicelib/parser/inpmkmod.c

@@ -7,7 +7,7 @@ Author: 1985 Thomas L. Quarles
 #include <stdio.h>
 #include "ngspice/inpdefs.h"
 #include "ngspice/iferrmsg.h"
-#include "inp.h"
+#include "inpxx.h"
 
 /*  global input model table.  */
 INPmodel *modtab = NULL;

src/spicelib/parser/inpmktmp.c

@@ -8,7 +8,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/ngspice.h"
 #include <stdio.h>
 #include "ngspice/inpdefs.h"
-#include "inp.h"
+#include "inpxx.h"
 
 
 char *INPmkTemp(char *string)

src/spicelib/parser/inppas2.c

@@ -8,7 +8,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/inpmacs.h"
 
 #include "inppas2.h"
-#include "inp.h"
+#include "inpxx.h"
 
 #ifdef XSPICE
 /* gtri - add - wbk - 11/9/90 - include function prototypes */

src/spicelib/parser/inppname.c

@@ -15,7 +15,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/fteext.h"
 #include "ngspice/ifsim.h"
 #include "ngspice/iferrmsg.h"
-#include "inp.h"
+#include "inpxx.h"
 
 int INPpName(char *parm, IFvalue * val, CKTcircuit *ckt, int dev, GENinstance *fast)
 		    /* the name of the parameter to set */

src/spicelib/parser/inpptree.c

@@ -9,7 +9,7 @@ Author: 1987 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include "ngspice/iferrmsg.h"
 #include "ngspice/inpdefs.h"
 #include "ngspice/inpptree.h"
-#include "inp.h"
+#include "inpxx.h"
 
 extern void controlled_exit(int status);
 

src/spicelib/parser/inpsymt.c

@@ -16,7 +16,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include "ngspice/inpdefs.h"
 #include "ngspice/cpstd.h"
 #include "ngspice/fteext.h"
-#include "inp.h"
+#include "inpxx.h"
 
 
 static int hash(char *name, int tsize);

src/spicelib/parser/inptyplk.c

@@ -12,7 +12,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/cpdefs.h"
 #include "ngspice/fteext.h"
 #include "ngspice/ifsim.h"
-#include "inp.h"
+#include "inpxx.h"
 
 int INPtypelook(char *type)
 {

src/spicelib/parser/ptfuncs.c

@@ -13,7 +13,7 @@ Author: 1987 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include "ngspice/fteext.h"
 #include "ngspice/ifsim.h"
 #include "ngspice/inpptree.h"
-#include "inp.h"
+#include "inpxx.h"
 
 /* XXX These should be in math.h */
 

src/spicelib/parser/sperror.c

@@ -13,7 +13,7 @@ Author: 1985 Thomas L. Quarles
 #include "ngspice/sperror.h"
 #include "ngspice/cktdefs.h"
 #include "ngspice/ifsim.h"
-#include "inp.h"
+#include "inpxx.h"
 
 const char *SPerror(int type)
 {

visualc/vngspice.vcproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
@@ -2145,7 +2145,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\parser\inp.h"
+				RelativePath="..\src\spicelib\parser\inpxx.h"
 				>
 			</File>
 			<File