From b1a2eef4d0fb140c1e10dc41d401aa4c588f018b Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 14 Jul 2013 20:12:17 +0200
Subject: [PATCH] simplify #ifdef nesting #1/4

---
 src/spicelib/analysis/dcpss.c  | 9 ++++++---
 src/spicelib/analysis/dctran.c | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/spicelib/analysis/dcpss.c b/src/spicelib/analysis/dcpss.c
index 97dac499d..8fe76ddbe 100644
--- a/src/spicelib/analysis/dcpss.c
+++ b/src/spicelib/analysis/dcpss.c
@@ -1206,6 +1206,12 @@ resume:
 #endif
         }
 
+#ifndef XSPICE
+        /* don't want to get below delmin for no reason */
+        ckt->CKTdelta = MAX(ckt->CKTdelta, ckt->CKTdelmin*2.0);
+    }
+#endif
+
 #ifdef XSPICE
     }
 
@@ -1251,9 +1257,6 @@ resume:
 /* gtri - end - wbk - Modify Breakpoint stuff */
 #else /* !XSPICE */
 
-        /* don't want to get below delmin for no reason */
-        ckt->CKTdelta = MAX(ckt->CKTdelta, ckt->CKTdelmin*2.0);
-    }
     else if(ckt->CKTtime + ckt->CKTdelta >= ckt->CKTbreaks[0]) {
         ckt->CKTsaveDelta = ckt->CKTdelta;
         ckt->CKTdelta = ckt->CKTbreaks[0] - ckt->CKTtime;
diff --git a/src/spicelib/analysis/dctran.c b/src/spicelib/analysis/dctran.c
index 97b8847d0..f7b10b9bb 100644
--- a/src/spicelib/analysis/dctran.c
+++ b/src/spicelib/analysis/dctran.c
@@ -561,6 +561,12 @@ resume:
 #endif
         }
 
+#ifndef XSPICE
+        /* don't want to get below delmin for no reason */
+        ckt->CKTdelta = MAX(ckt->CKTdelta, ckt->CKTdelmin*2.0);
+    }
+#endif
+
 #ifdef XSPICE
     }
 
@@ -606,9 +612,6 @@ resume:
 /* gtri - end - wbk - Modify Breakpoint stuff */
 #else /* !XSPICE */
 
-        /* don't want to get below delmin for no reason */
-        ckt->CKTdelta = MAX(ckt->CKTdelta, ckt->CKTdelmin*2.0);
-    }
     else if(ckt->CKTtime + ckt->CKTdelta >= ckt->CKTbreaks[0]) {
         ckt->CKTsaveDelta = ckt->CKTdelta;
         ckt->CKTdelta = ckt->CKTbreaks[0] - ckt->CKTtime;