From 719705adbce81a467d9dca95a563547fc97c51fd Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 3 Feb 2013 15:57:23 +0100
Subject: [PATCH] retire #define NODE_VOLTAGE, use SP_VOLTAGE instead

(grep "git --no-pager grep -nH -e '\\(SP_\\|NODE_\\)\\(VOLTAGE\\|CURRENT\\)'")
---
 src/maths/ni/niiter.c            | 2 +-
 src/spicelib/analysis/cktsetup.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/maths/ni/niiter.c b/src/maths/ni/niiter.c
index 863685276..4d6c83e08 100644
--- a/src/maths/ni/niiter.c
+++ b/src/maths/ni/niiter.c
@@ -212,7 +212,7 @@ NIiter(CKTcircuit *ckt, int maxIter)
                 (iterno>1) ) {
             maxdiff=0;
             for (node = ckt->CKTnodes->next; node; node = node->next) {
-                if(node->type == NODE_VOLTAGE) {
+                if(node->type == SP_VOLTAGE) {
                     diff = ckt->CKTrhs [node->number] -
                            ckt->CKTrhsOld [node->number];
                     if (diff>maxdiff) maxdiff=diff;
diff --git a/src/spicelib/analysis/cktsetup.c b/src/spicelib/analysis/cktsetup.c
index a3609dd36..ec47307cc 100644
--- a/src/spicelib/analysis/cktsetup.c
+++ b/src/spicelib/analysis/cktsetup.c
@@ -104,7 +104,7 @@ CKTsetup(CKTcircuit *ckt)
 
         /* Count number of voltage nodes in circuit */
         for(num_nodes = 0, node = ckt->CKTnodes; node; node = node->next)
-            if((node->type == NODE_VOLTAGE) && (node->number != 0))
+            if((node->type == SP_VOLTAGE) && (node->number != 0))
                 num_nodes++;
 
         /* Allocate space for the matrix diagonal data */
@@ -118,7 +118,7 @@ CKTsetup(CKTcircuit *ckt)
 
         /* Get/create matrix diagonal entry following what RESsetup does */
         for(i = 0, node = ckt->CKTnodes; node; node = node->next) {
-            if((node->type == NODE_VOLTAGE) && (node->number != 0)) {
+            if((node->type == SP_VOLTAGE) && (node->number != 0)) {
                 ckt->enh->rshunt_data.diag[i] =
                       SMPmakeElt(matrix,node->number,node->number);
                 i++;