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

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

diff --git a/src/spicelib/analysis/dcpss.c b/src/spicelib/analysis/dcpss.c
index 368cd288e..2afb2374f 100644
--- a/src/spicelib/analysis/dcpss.c
+++ b/src/spicelib/analysis/dcpss.c
@@ -1265,18 +1265,7 @@ resume:
     }
 
 /* gtri - end - wbk - Modify Breakpoint stuff */
-#else /* !XSPICE */
 
-#ifdef CLUSTER
-    if(!CLUsync(ckt->CKTtime,&ckt->CKTdelta,0)) {
-      fprintf (stderr, "Sync error!\n");
-      exit(0);
-    }
-#endif
-
-#endif /* XSPICE */
-
-#ifdef XSPICE
 /* gtri - begin - wbk - Do event solution */
 
     if(ckt->evt->counts.num_insts > 0) {
@@ -1319,6 +1308,15 @@ resume:
     } /* end if there are event instances */
 
 /* gtri - end - wbk - Do event solution */
+#else
+
+#ifdef CLUSTER
+    if(!CLUsync(ckt->CKTtime,&ckt->CKTdelta,0)) {
+      fprintf (stderr, "Sync error!\n");
+      exit(0);
+    }
+#endif /* CLUSTER */
+
 #endif
 
     /* What is that??? */
diff --git a/src/spicelib/analysis/dctran.c b/src/spicelib/analysis/dctran.c
index b5263ffe9..7652b95e2 100644
--- a/src/spicelib/analysis/dctran.c
+++ b/src/spicelib/analysis/dctran.c
@@ -620,18 +620,7 @@ resume:
     }
 
 /* gtri - end - wbk - Modify Breakpoint stuff */
-#else /* !XSPICE */
 
-#ifdef CLUSTER
-    if(!CLUsync(ckt->CKTtime,&ckt->CKTdelta,0)) {
-      printf("Sync error!\n");
-      exit(0);
-    }
-#endif
-
-#endif /* XSPICE */
-
-#ifdef XSPICE
 /* gtri - begin - wbk - Do event solution */
 
     if(ckt->evt->counts.num_insts > 0) {
@@ -674,6 +663,15 @@ resume:
     } /* end if there are event instances */
 
 /* gtri - end - wbk - Do event solution */
+#else
+
+#ifdef CLUSTER
+    if(!CLUsync(ckt->CKTtime,&ckt->CKTdelta,0)) {
+      printf("Sync error!\n");
+      exit(0);
+    }
+#endif /* CLUSTER */
+
 #endif
     for(i=5; i>=0; i--)
         ckt->CKTdeltaOld[i+1] = ckt->CKTdeltaOld[i];