From 8d166ebcc9ec1f4a5be68d575c7a0375317c595a Mon Sep 17 00:00:00 2001
From: h_vogt <h_vogt>
Date: Tue, 4 Jun 2013 22:59:08 +0200
Subject: [PATCH] enable compilation with MS Visual Studio 2008

---
 src/maths/ni/niconv.c   |   3 +-
 visualc/vngspice.vcproj | 140 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 136 insertions(+), 7 deletions(-)

diff --git a/src/maths/ni/niconv.c b/src/maths/ni/niconv.c
index 48ed9a577..53e1b5e08 100644
--- a/src/maths/ni/niconv.c
+++ b/src/maths/ni/niconv.c
@@ -26,6 +26,8 @@ NIconvTest(CKTcircuit *ckt)
     double old;
     double new;
     double tol;
+#else
+    double maximum = 0 ;
 #endif
 
     size = SMPmatSize(ckt->CKTmatrix);
@@ -73,7 +75,6 @@ NIconvTest(CKTcircuit *ckt)
 #else
 
     /* KCL Verification */
-    double maximum = 0 ;
 
     node = ckt->CKTnodes ;
     for (i = 1 ; i <= size ; i++)
diff --git a/visualc/vngspice.vcproj b/visualc/vngspice.vcproj
index 92e1638e6..9fa1d5d5d 100644
--- a/visualc/vngspice.vcproj
+++ b/visualc/vngspice.vcproj
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\src\maths\poly&quot;;&quot;$(ProjectDir)..\src\frontend&quot;;&quot;$(ProjectDir)..\src\spicelib\devices&quot;;&quot;$(ProjectDir)include&quot;;&quot;$(ProjectDir)..\src\include&quot;;&quot;C:\Program Files (x86)\Visual Leak Detector\include&quot;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;SIMULATOR;NGDEBUG;XSPICE"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;SIMULATOR;NGDEBUG;XSPICE;KIRCHHOFF"
 				MinimalRebuild="true"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="0"
@@ -790,7 +790,7 @@
 				FavorSizeOrSpeed="1"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\src\maths\poly&quot;;&quot;$(ProjectDir)..\src\frontend&quot;;&quot;$(ProjectDir)..\src\spicelib\devices&quot;;&quot;$(ProjectDir)..\src\include&quot;;&quot;$(ProjectDir)include&quot;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;SIMULATOR;USE_OMP"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;SIMULATOR;USE_OMP;KIRCHHOFF"
 				MinimalRebuild="false"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="0"
@@ -2144,10 +2144,6 @@
 				RelativePath="..\src\frontend\init.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\spicelib\parser\inpxx.h"
-				>
-			</File>
 			<File
 				RelativePath="..\src\frontend\inp.h"
 				>
@@ -2188,6 +2184,10 @@
 				RelativePath="..\src\frontend\parser\input.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\parser\inpxx.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\frontend\interp.h"
 				>
@@ -3216,6 +3216,10 @@
 				RelativePath="..\src\spicelib\devices\asrc\asrcmdel.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\asrc\asrcnode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\asrc\asrcpar.c"
 				>
@@ -3296,6 +3300,10 @@
 				RelativePath="..\src\spicelib\devices\bsim1\b1mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\bsim1\b1node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\bsim1\b1noi.c"
 				>
@@ -3372,6 +3380,10 @@
 				RelativePath="..\src\spicelib\devices\bsim2\b2mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\bsim2\b2node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\bsim2\b2noi.c"
 				>
@@ -3444,6 +3456,10 @@
 				RelativePath="..\src\spicelib\devices\bsim3\b3mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\bsim3\b3node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\bsim3\b3noi.c"
 				>
@@ -3512,6 +3528,10 @@
 				RelativePath="..\src\spicelib\devices\bsim3soi_dd\b3soiddmpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\bsim3soi_dd\b3soiddnode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\bsim3soi_dd\b3soiddnoi.c"
 				>
@@ -3588,6 +3608,10 @@
 				RelativePath="..\src\spicelib\devices\bsim3soi_fd\b3soifdmpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\bsim3soi_fd\b3soifdnode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\bsim3soi_fd\b3soifdnoi.c"
 				>
@@ -3664,6 +3688,10 @@
 				RelativePath="..\src\spicelib\devices\bsim3soi_pd\b3soipdmpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\bsim3soi_pd\b3soipdnode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\bsim3soi_pd\b3soipdnoi.c"
 				>
@@ -3740,6 +3768,10 @@
 				RelativePath="..\src\spicelib\devices\bsim3v0\b3v0mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\bsim3v0\b3v0node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\bsim3v0\b3v0noi.c"
 				>
@@ -3812,6 +3844,10 @@
 				RelativePath="..\src\spicelib\devices\bsim3v1\b3v1mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\bsim3v1\b3v1node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\bsim3v1\b3v1noi.c"
 				>
@@ -3884,6 +3920,10 @@
 				RelativePath="..\src\spicelib\devices\bsim3v32\b3v32mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\bsim3v32\b3v32node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\bsim3v32\b3v32noi.c"
 				>
@@ -3960,6 +4000,10 @@
 				RelativePath="..\src\spicelib\devices\bsim4\b4mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\bsim4\b4node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\bsim4\b4noi.c"
 				>
@@ -4028,6 +4072,10 @@
 				RelativePath="..\src\spicelib\devices\bsimsoi\b4soimpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\bsimsoi\b4soinode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\bsimsoi\b4soinoi.c"
 				>
@@ -4112,6 +4160,10 @@
 				RelativePath="..\src\spicelib\devices\bsim4v4\b4v4mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\bsim4v4\b4v4node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\bsim4v4\b4v4noi.c"
 				>
@@ -4188,6 +4240,10 @@
 				RelativePath="..\src\spicelib\devices\bsim4v5\b4v5mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\bsim4v5\b4v5node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\bsim4v5\b4v5noi.c"
 				>
@@ -4264,6 +4320,10 @@
 				RelativePath="..\src\spicelib\devices\bsim4v6\b4v6mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\bsim4v6\b4v6node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\bsim4v6\b4v6noi.c"
 				>
@@ -4356,6 +4416,10 @@
 				RelativePath="..\src\spicelib\devices\bjt\bjtmpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\bjt\bjtnode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\bjt\bjtnoise.c"
 				>
@@ -5352,6 +5416,10 @@
 				RelativePath="..\src\spicelib\devices\dio\diompar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\dio\dionode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\dio\dionoise.c"
 				>
@@ -5668,6 +5736,10 @@
 				RelativePath="..\src\spicelib\devices\hfet2\hfet2mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hfet2\hfet2node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\hfet2\hfet2param.c"
 				>
@@ -5728,6 +5800,10 @@
 				RelativePath="..\src\spicelib\devices\hfet1\hfetmpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hfet1\hfetnode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\hfet1\hfetparam.c"
 				>
@@ -5804,6 +5880,10 @@
 				RelativePath="..\src\spicelib\devices\hisim2\hsm2mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hisim2\hsm2node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\hisim2\hsm2noi.c"
 				>
@@ -5880,6 +5960,10 @@
 				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvmpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvnode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvnoi.c"
 				>
@@ -6364,6 +6448,10 @@
 				RelativePath="..\src\spicelib\devices\jfet2\jfet2mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\jfet2\jfet2node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\jfet2\jfet2noi.c"
 				>
@@ -6432,6 +6520,10 @@
 				RelativePath="..\src\spicelib\devices\jfet\jfetmpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\jfet\jfetnode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\jfet\jfetnoi.c"
 				>
@@ -6616,6 +6708,10 @@
 				RelativePath="..\src\spicelib\devices\mesa\mesamparam.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\mesa\mesanode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\mesa\mesaparam.c"
 				>
@@ -6688,6 +6784,10 @@
 				RelativePath="..\src\spicelib\devices\mes\mesmpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\mes\mesnode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\mes\mesnoise.c"
 				>
@@ -6872,6 +6972,10 @@
 				RelativePath="..\src\spicelib\devices\mos1\mos1mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\mos1\mos1node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\mos1\mos1noi.c"
 				>
@@ -6972,6 +7076,10 @@
 				RelativePath="..\src\spicelib\devices\mos2\mos2mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\mos2\mos2node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\mos2\mos2noi.c"
 				>
@@ -7072,6 +7180,10 @@
 				RelativePath="..\src\spicelib\devices\mos3\mos3mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\mos3\mos3node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\mos3\mos3noi.c"
 				>
@@ -7152,6 +7264,10 @@
 				RelativePath="..\src\spicelib\devices\mos6\mos6mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\mos6\mos6node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\mos6\mos6par.c"
 				>
@@ -7224,6 +7340,10 @@
 				RelativePath="..\src\spicelib\devices\mos9\mos9mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\mos9\mos9node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\mos9\mos9noi.c"
 				>
@@ -8068,6 +8188,10 @@
 				RelativePath="..\src\spicelib\devices\soi3\soi3mpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\soi3\soi3node.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\soi3\soi3nois.c"
 				>
@@ -8564,6 +8688,10 @@
 				RelativePath="..\src\spicelib\devices\vbic\vbicmpar.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\vbic\vbicnode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\vbic\vbicnoise.c"
 				>