macro ERROR -> MERROR

ChangeLog

@@ -1,5 +1,7 @@
 2010-02-11 Holger Vogt
  * terminal.h, cpextern.h: use format (__printf__, 1, 2)
+ * pzan.c, nipzmeth.c, cktpzstr.c, macros.h: remove conflicting macro definition
+  (MS Visual Studio) ERROR -> MERROR 
  
 2010-02-08 Holger Vogt
  * com_sysinfo.c: 64 bit support enabled

src/include/macros.h

@@ -43,7 +43,7 @@
 #define NIL(type) ((type *)0) 
 #define ABORT() fflush(stderr);fflush(stdout);abort();
 
-#define ERROR(CODE,MESSAGE)	{			      \
+#define MERROR(CODE,MESSAGE)	{			      \
 	errMsg = (char *) tmalloc(strlen(MESSAGE) + 1);     \
 	strcpy(errMsg, (MESSAGE));			      \
 	return (CODE);					      \

src/maths/ni/nipzmeth.c

@@ -406,7 +406,7 @@ NIpzSym2(PZtrial **set, PZtrial *new)
 			new->s.real = (set[1]->s.real + b) / 2.0;
 		    }
 		} else
-		    ERROR(E_PANIC,"Lost numerical stability");
+		    MERROR(E_PANIC,"Lost numerical stability");
 	    } else {
 #ifdef PZDEBUG
 		DEBUG(1) fprintf(stderr, "@@@ take second (c)\n");

src/spicelib/analysis/cktpzstr.c

@@ -210,7 +210,7 @@ CKTpzFindZeros(CKTcircuit *ckt, PZtrial **rootinfo, int *rootcount)
 	clear_trials(ISAROOT);
 	*rootinfo = NULL;
 	*rootcount = 0;
-	ERROR(E_SHORT, "The input signal is shorted on the way to the output");
+	MERROR(E_SHORT, "The input signal is shorted on the way to the output");
     } else
 	clear_trials(0);
 
@@ -396,7 +396,7 @@ PZeval(int strat, PZtrial **set, PZtrial **new_trial_p)
 	break;
 
     default:
-	ERROR(E_PANIC, "Step type unkown");
+	MERROR(E_PANIC, "Step type unkown");
 	break;
     }
 

src/spicelib/analysis/pzan.c

@@ -89,7 +89,7 @@ PZinit(CKTcircuit *ckt)
 		i = CKTtypelook("LTRA");
     }
     if (i != -1 && ckt->CKThead[i] != NULL)
-	ERROR(E_XMISSIONLINE, "Transmission lines not supported")
+	MERROR(E_XMISSIONLINE, "Transmission lines not supported")
 
     pzan->PZpoleList = (PZtrial *) NULL;
     pzan->PZzeroList = (PZtrial *) NULL;
@@ -97,19 +97,19 @@ PZinit(CKTcircuit *ckt)
     pzan->PZnZeros = 0;
 
     if (pzan->PZin_pos == pzan->PZin_neg)
-	ERROR(E_SHORT, "Input is shorted")
+	MERROR(E_SHORT, "Input is shorted")
 
     if (pzan->PZout_pos == pzan->PZout_neg)
-	ERROR(E_SHORT, "Output is shorted")
+	MERROR(E_SHORT, "Output is shorted")
 
     if (pzan->PZin_pos == pzan->PZout_pos
         && pzan->PZin_neg == pzan->PZout_neg
 	&& pzan->PZinput_type == PZ_IN_VOL)
-	ERROR(E_INISOUT, "Transfer function is unity")
+	MERROR(E_INISOUT, "Transfer function is unity")
     else if (pzan->PZin_pos == pzan->PZout_neg
         && pzan->PZin_neg == pzan->PZout_pos
 	&& pzan->PZinput_type == PZ_IN_VOL)
-	ERROR(E_INISOUT, "Transfer function is -1")
+	MERROR(E_INISOUT, "Transfer function is -1")
 
     return(OK);
 }