diff --git a/ChangeLog b/ChangeLog
index afeb76b61..366ac0947 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2011-12-13  Robert Larice
+ * src/spicelib/analysis/acaskq.c ,
+ * src/spicelib/analysis/acsetp.c ,
+ * src/spicelib/analysis/daskq.c ,
+ * src/spicelib/analysis/dsetparm.c ,
+ * src/spicelib/analysis/naskq.c ,
+ * src/spicelib/analysis/nsetparm.c ,
+ * src/spicelib/analysis/pssaskq.c ,
+ * src/spicelib/analysis/pssinit.c ,
+ * src/spicelib/analysis/psssetp.c ,
+ * src/spicelib/analysis/pzaskq.c ,
+ * src/spicelib/analysis/pzsetp.c ,
+ * src/spicelib/analysis/tfsetp.c ,
+ * src/spicelib/analysis/tranaskq.c ,
+ * src/spicelib/analysis/traninit.c ,
+ * src/spicelib/analysis/transetp.c :
+  auxiliary define `job' --> local variable `job'
+
 2011-12-13  Robert Larice
  * src/spicelib/analysis/acaskq.c ,
  * src/spicelib/analysis/acsetp.c ,
diff --git a/src/spicelib/analysis/acaskq.c b/src/spicelib/analysis/acaskq.c
index d959e1fb1..fc6459b99 100644
--- a/src/spicelib/analysis/acaskq.c
+++ b/src/spicelib/analysis/acaskq.c
@@ -16,7 +16,7 @@ Author: 1985 Thomas L. Quarles
 int 
 ACaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    #define job ((ACAN *) anal)
+    ACAN *job = (ACAN *) anal;
 
     NG_IGNORE(ckt);
 
diff --git a/src/spicelib/analysis/acsetp.c b/src/spicelib/analysis/acsetp.c
index b5b051e98..d6571d7a0 100644
--- a/src/spicelib/analysis/acsetp.c
+++ b/src/spicelib/analysis/acsetp.c
@@ -15,7 +15,7 @@ Author: 1985 Thomas L. Quarles
 int 
 ACsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    #define job ((ACAN *) anal)
+    ACAN *job = (ACAN *) anal;
 
     NG_IGNORE(ckt);
 
diff --git a/src/spicelib/analysis/daskq.c b/src/spicelib/analysis/daskq.c
index 5ef67a6a7..a043c4520 100644
--- a/src/spicelib/analysis/daskq.c
+++ b/src/spicelib/analysis/daskq.c
@@ -14,7 +14,7 @@ Author: 1988 Jaijeet S Roychowdhury
 int 
 DaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    #define job ((DISTOAN *) anal)
+    DISTOAN *job = (DISTOAN *) anal;
 
     NG_IGNORE(ckt);
 
diff --git a/src/spicelib/analysis/dsetparm.c b/src/spicelib/analysis/dsetparm.c
index d9970d611..bf79a2ba2 100644
--- a/src/spicelib/analysis/dsetparm.c
+++ b/src/spicelib/analysis/dsetparm.c
@@ -15,7 +15,7 @@ Author: 1988 Jaijeet S Roychowdhury
 int 
 DsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    #define job ((DISTOAN *) anal)
+    DISTOAN *job = (DISTOAN *) anal;
 
     NG_IGNORE(ckt);
 
diff --git a/src/spicelib/analysis/naskq.c b/src/spicelib/analysis/naskq.c
index e662ca921..ed4f003d9 100644
--- a/src/spicelib/analysis/naskq.c
+++ b/src/spicelib/analysis/naskq.c
@@ -13,7 +13,7 @@ Author: 1987 Gary W. Ng
 int 
 NaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    #define job ((NOISEAN *) anal)
+    NOISEAN *job = (NOISEAN *) anal;
 
     NG_IGNORE(ckt);
 
diff --git a/src/spicelib/analysis/nsetparm.c b/src/spicelib/analysis/nsetparm.c
index af926106a..10cb3dcbb 100644
--- a/src/spicelib/analysis/nsetparm.c
+++ b/src/spicelib/analysis/nsetparm.c
@@ -14,7 +14,7 @@ Author: 1987 Gary W. Ng
 int 
 NsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    #define job ((NOISEAN *) anal)
+    NOISEAN *job = (NOISEAN *) anal;
 
     NG_IGNORE(ckt);
 
diff --git a/src/spicelib/analysis/pssaskq.c b/src/spicelib/analysis/pssaskq.c
index fe0d3d9a7..7d00be7ef 100755
--- a/src/spicelib/analysis/pssaskq.c
+++ b/src/spicelib/analysis/pssaskq.c
@@ -12,7 +12,7 @@ Author: 2010-05 Stefano Perticaroli ``spertica''
 int
 PSSaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    #define job ((PSSan *) anal)
+    PSSan *job = (PSSan *) anal;
 
     NG_IGNORE(ckt);
 
diff --git a/src/spicelib/analysis/pssinit.c b/src/spicelib/analysis/pssinit.c
index 1e8c891c1..471391b30 100755
--- a/src/spicelib/analysis/pssinit.c
+++ b/src/spicelib/analysis/pssinit.c
@@ -10,7 +10,7 @@ Author: 2010-05 Stefano Perticaroli ``spertica''
 
 int PSSinit(CKTcircuit *ckt, JOB *anal)
 {
-    #define job ((PSSan *) anal)
+    PSSan *job = (PSSan *) anal;
 
     /* Final time depends on stabilization time requested for PSS
 	and on at least one more oscillation period */
diff --git a/src/spicelib/analysis/psssetp.c b/src/spicelib/analysis/psssetp.c
index 173ac8a0c..843c4da7f 100755
--- a/src/spicelib/analysis/psssetp.c
+++ b/src/spicelib/analysis/psssetp.c
@@ -14,7 +14,7 @@ Author: 2010-05 Stefano Perticaroli ``spertica''
 int
 PSSsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    #define job ((PSSan *) anal)
+    PSSan *job = (PSSan *) anal;
 
     NG_IGNORE(ckt);
 
diff --git a/src/spicelib/analysis/pzaskq.c b/src/spicelib/analysis/pzaskq.c
index 102870185..070518900 100644
--- a/src/spicelib/analysis/pzaskq.c
+++ b/src/spicelib/analysis/pzaskq.c
@@ -15,7 +15,7 @@ Author: 1985 Thomas L. Quarles
 int 
 PZaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    #define job ((PZAN *) anal)
+    PZAN *job = (PZAN *) anal;
 
     switch(which) {
 
diff --git a/src/spicelib/analysis/pzsetp.c b/src/spicelib/analysis/pzsetp.c
index 84c3587b4..2643eaf1f 100644
--- a/src/spicelib/analysis/pzsetp.c
+++ b/src/spicelib/analysis/pzsetp.c
@@ -16,7 +16,7 @@ Author: 1985 Thomas L. Quarles
 int 
 PZsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    #define job ((PZAN *) anal)
+    PZAN *job = (PZAN *) anal;
 
     NG_IGNORE(ckt);
 
diff --git a/src/spicelib/analysis/tfsetp.c b/src/spicelib/analysis/tfsetp.c
index 84964915c..5d9a62f18 100644
--- a/src/spicelib/analysis/tfsetp.c
+++ b/src/spicelib/analysis/tfsetp.c
@@ -15,7 +15,7 @@ Author: 1985 Thomas L. Quarles
 int 
 TFsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    #define job ((TFan *) anal)
+    TFan *job = (TFan *) anal;
 
     NG_IGNORE(ckt);
 
diff --git a/src/spicelib/analysis/tranaskq.c b/src/spicelib/analysis/tranaskq.c
index b59d07dfc..528ec5137 100644
--- a/src/spicelib/analysis/tranaskq.c
+++ b/src/spicelib/analysis/tranaskq.c
@@ -13,7 +13,7 @@ Author: 1985 Thomas L. Quarles
 int 
 TRANaskQuest(CKTcircuit *ckt, JOB *anal, int which,IFvalue *value)
 {
-    #define job ((TRANan *) anal)
+    TRANan *job = (TRANan *) anal;
 
     NG_IGNORE(ckt);
 
diff --git a/src/spicelib/analysis/traninit.c b/src/spicelib/analysis/traninit.c
index 981257568..cfca9426a 100644
--- a/src/spicelib/analysis/traninit.c
+++ b/src/spicelib/analysis/traninit.c
@@ -15,7 +15,7 @@ Modified: 2000 AlansFixes
 
 int TRANinit(CKTcircuit	*ckt, JOB *anal)
 {
-    #define job ((TRANan *) anal)
+    TRANan *job = (TRANan *) anal;
 
     ckt->CKTfinalTime = job->TRANfinalTime;
     ckt->CKTstep      = job->TRANstep;
diff --git a/src/spicelib/analysis/transetp.c b/src/spicelib/analysis/transetp.c
index 2917b7f62..58dca1606 100644
--- a/src/spicelib/analysis/transetp.c
+++ b/src/spicelib/analysis/transetp.c
@@ -15,7 +15,7 @@ Author: 1985 Thomas L. Quarles
 int 
 TRANsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
 {
-    #define job ((TRANan *) anal)
+    TRANan *job = (TRANan *) anal;
 
     NG_IGNORE(ckt);