diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml index 008f97bd5..a6279fe02 100644 --- a/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml +++ b/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml @@ -82,7 +82,7 @@ int $(module)ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, default: return(-1); } - return(-1); + } diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml index 53200b0f6..dada16324 100644 --- a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml +++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml @@ -91,10 +91,10 @@ #define EXIT_IF_ISNAN(var) \\ { \\ } - +#ifndef _MSC_VER static inline double max(double x,double y) { return ((x)>(y))?(x):(y); } static inline double min(double x,double y) { return ((x)<(y))?(x):(y); } - +#endif /* ngspice \$simparam variables gdev (1/Ohms): Additional conductance to be added to nonlinear branches for conductance homotopy convergence algorithm. gmin (1/Ohms): Minimum conductance placed in parallel with nonlinear branches. diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml index 603b11db7..4581761b8 100644 --- a/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml +++ b/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml @@ -334,7 +334,7 @@ int $(module)guesstopology (SMPmatrix *matrix, CKTcircuit *ckt, $(module)model * int %(name);\n - double %(name)=0.0/0.0;\n + double %(name)=0.0;\n char* %(name);\n diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml index 1c519b3f3..58715b72a 100644 --- a/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml +++ b/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml @@ -63,7 +63,7 @@ int $(module)mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value) default: return(-1); } - return(-1); + } diff --git a/src/spicelib/devices/adms/admst/ngspiceVersion.xml b/src/spicelib/devices/adms/admst/ngspiceVersion.xml index 6ae5f49dc..18c2ed505 100644 --- a/src/spicelib/devices/adms/admst/ngspiceVersion.xml +++ b/src/spicelib/devices/adms/admst/ngspiceVersion.xml @@ -1031,7 +1031,7 @@ #if defined(_DYNAMIC)\n int %s;\n - double %s=0.0/0.0;\n + double %s=0.0;\n char* %s;\n