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

---
 src/spicelib/analysis/dcpss.c  | 18 +++++++++++-------
 src/spicelib/analysis/dctran.c | 22 +++++++++++++---------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/spicelib/analysis/dcpss.c b/src/spicelib/analysis/dcpss.c
index b77f84a09..368cd288e 100644
--- a/src/spicelib/analysis/dcpss.c
+++ b/src/spicelib/analysis/dcpss.c
@@ -1213,6 +1213,17 @@ resume:
 
     }
 
+#ifndef XSPICE
+    else if(ckt->CKTtime + ckt->CKTdelta >= ckt->CKTbreaks[0]) {
+        ckt->CKTsaveDelta = ckt->CKTdelta;
+        ckt->CKTdelta = ckt->CKTbreaks[0] - ckt->CKTtime;
+        /* fprintf (stderr, "delta cut to %g to hit breakpoint\n" ,ckt->CKTdelta) ; */
+        fflush(stdout);
+        ckt->CKTbreak = 1; /* why? the current pt. is not a bkpt. */
+    }
+#endif /* !XSPICE */
+
+
 #ifdef XSPICE
 /* gtri - begin - wbk - Add Breakpoint stuff */
 
@@ -1256,13 +1267,6 @@ resume:
 /* gtri - end - wbk - Modify Breakpoint stuff */
 #else /* !XSPICE */
 
-    else if(ckt->CKTtime + ckt->CKTdelta >= ckt->CKTbreaks[0]) {
-        ckt->CKTsaveDelta = ckt->CKTdelta;
-        ckt->CKTdelta = ckt->CKTbreaks[0] - ckt->CKTtime;
-        /* fprintf (stderr, "delta cut to %g to hit breakpoint\n" ,ckt->CKTdelta) ; */
-        fflush(stdout);
-        ckt->CKTbreak = 1; /* why? the current pt. is not a bkpt. */
-    }
 #ifdef CLUSTER
     if(!CLUsync(ckt->CKTtime,&ckt->CKTdelta,0)) {
       fprintf (stderr, "Sync error!\n");
diff --git a/src/spicelib/analysis/dctran.c b/src/spicelib/analysis/dctran.c
index 90ad29a80..b5263ffe9 100644
--- a/src/spicelib/analysis/dctran.c
+++ b/src/spicelib/analysis/dctran.c
@@ -566,6 +566,19 @@ resume:
 
     }
 
+#ifndef XSPICE
+    else if(ckt->CKTtime + ckt->CKTdelta >= ckt->CKTbreaks[0]) {
+        ckt->CKTsaveDelta = ckt->CKTdelta;
+        ckt->CKTdelta = ckt->CKTbreaks[0] - ckt->CKTtime;
+#ifdef STEPDEBUG
+        (void)printf("delta cut to %g to hit breakpoint\n",ckt->CKTdelta);
+        fflush(stdout);
+#endif
+        ckt->CKTbreak = 1; /* why? the current pt. is not a bkpt. */
+    }
+#endif /* !XSPICE */
+
+
 #ifdef XSPICE
 /* gtri - begin - wbk - Add Breakpoint stuff */
 
@@ -609,15 +622,6 @@ resume:
 /* gtri - end - wbk - Modify Breakpoint stuff */
 #else /* !XSPICE */
 
-    else if(ckt->CKTtime + ckt->CKTdelta >= ckt->CKTbreaks[0]) {
-        ckt->CKTsaveDelta = ckt->CKTdelta;
-        ckt->CKTdelta = ckt->CKTbreaks[0] - ckt->CKTtime;
-#ifdef STEPDEBUG
-        (void)printf("delta cut to %g to hit breakpoint\n",ckt->CKTdelta);
-        fflush(stdout);
-#endif
-        ckt->CKTbreak = 1; /* why? the current pt. is not a bkpt. */
-    }
 #ifdef CLUSTER
     if(!CLUsync(ckt->CKTtime,&ckt->CKTdelta,0)) {
       printf("Sync error!\n");