From 305d004c38d9362e75f401f4bea0f41c0bca456b Mon Sep 17 00:00:00 2001 From: rlar Date: Mon, 25 Sep 2017 20:39:43 +0200 Subject: [PATCH] admst/ngspice*.xml, use _f prefix to avoid name collision with well known function names actually the leading underscore itself is reserved --- .../devices/adms/admst/ngspiceMODULE.hxx.xml | 2 +- .../adms/admst/ngspiceMODULEdefs.h.xml | 50 +++++++++---------- .../admst/ngspiceMODULEguesstopology.c.xml | 2 +- .../devices/adms/admst/ngspiceVersion.xml | 8 +-- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml b/src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml index e0cee079a..d92922348 100644 --- a/src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml +++ b/src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml @@ -641,7 +641,7 @@ or name='asinh' or name='acosh' or name='atanh' or name='atan2' or name='atan' or name='ln' or name='log' or name='exp' or name='sqrt' or name='abs' or name='limexp' or name='div' or name='pow' or name='hypot' or name='min' or name='max' ]"> - + diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml index 72ffc9aad..1f24bd27b 100644 --- a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml +++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml @@ -124,62 +124,62 @@ static inline double min(double x,double y) { return ((x)<(y))?(x):(y); } #define _circuit_temp ckt->CKTtemp #define _scale 1.0 -#define _cos(val,arg) val = cos(arg); +#define _f_cos(val,arg) val = cos(arg); #define _d_cos(val,dval,arg) val = cos(arg); dval = (-sin(arg)); -#define _sin(val,arg) val = sin(arg); +#define _f_sin(val,arg) val = sin(arg); #define _d_sin(val,dval,arg) val = sin(arg); dval = (cos(arg)); -#define _tan(val,arg) val = tan(arg); +#define _f_tan(val,arg) val = tan(arg); #define _d_tan(val,dval,arg) val = tan(arg); dval = (1.0/cos(arg)/cos(arg)); -#define _asinh(val,arg) val = asinh(arg); +#define _f_asinh(val,arg) val = asinh(arg); #define _d_asinh(val,dval,arg) val = asinh(arg); dval = (1.0/sqrt(arg*arg + 1)); -#define _hypot(xy,x,y) xy = sqrt((x)*(x)+(y)*(y)); +#define _f_hypot(xy,x,y) xy = sqrt((x)*(x)+(y)*(y)); #define _dx_hypot(dx,xy,x,y) dx = (x)/(xy); #define _dy_hypot(dy,xy,x,y) dy = (y)/(xy); -#define _max(xy,x,y) xy = ((x)>(y))?(x):(y); +#define _f_max(xy,x,y) xy = ((x)>(y))?(x):(y); #define _dx_max(dx,xy,x,y) dx = ((x)>(y))?1.0:0.0; #define _dy_max(dy,xy,x,y) dy = ((x)>(y))?0.0:1.0; -#define _min(xy,x,y) xy = ((x)<(y))?(x):(y); +#define _f_min(xy,x,y) xy = ((x)<(y))?(x):(y); #define _dx_min(dx,xy,x,y) dx = ((x)<(y))?1.0:0.0; #define _dy_min(dy,xy,x,y) dy = ((x)<(y))?0.0:1.0; -#define _cosh(val,arg) val = cosh(arg); +#define _f_cosh(val,arg) val = cosh(arg); #define _d_cosh(val,dval,arg) val = cosh(arg); dval = (sinh(arg)); -#define _sinh(val,arg) val = sinh(arg); +#define _f_sinh(val,arg) val = sinh(arg); #define _d_sinh(val,dval,arg) val = sinh(arg); dval = (cosh(arg)); -#define _tanh(val,arg) val = tanh(arg); +#define _f_tanh(val,arg) val = tanh(arg); #define _d_tanh(val,dval,arg) val = tanh(arg); dval = (1.0/cosh(arg)/cosh(arg)); -#define _acos(val,arg) val = acos(arg); +#define _f_acos(val,arg) val = acos(arg); #define _d_acos(val,dval,arg) val = acos(arg); dval = (-1.0/sqrt(1-arg*arg)); -#define _asin(val,arg) val = asin(arg); +#define _f_asin(val,arg) val = asin(arg); #define _d_asin(val,dval,arg) val = asin(arg); dval = (+1.0/sqrt(1-arg*arg)); -#define _atan(val,arg) val = atan(arg); +#define _f_atan(val,arg) val = atan(arg); #define _d_atan(val,dval,arg) val = atan(arg); dval = (+1.0/(1+arg*arg)); -#define _logE(val,arg) val = log(arg); +#define _f_logE(val,arg) val = log(arg); #define _d_logE(val,dval,arg) val = log(arg); dval = (1.0/arg); -#define _log10(val,arg) val = log10(arg); +#define _f_log10(val,arg) val = log10(arg); #define _d_log10(val,dval,arg) val = log10(arg); dval = (1.0/arg/log(10)); -#define _exp(val,arg) val = exp(arg); +#define _f_exp(val,arg) val = exp(arg); #define _d_exp(val,dval,arg) val = exp(arg); dval = val; -#define _sqrt(val,arg) val = sqrt(arg); +#define _f_sqrt(val,arg) val = sqrt(arg); #define _d_sqrt(val,dval,arg) val = sqrt(arg); dval = (1.0/val/2.0); -#define _pow(xy,x,y) xy = pow(x,y); +#define _f_pow(xy,x,y) xy = pow(x,y); #define _dx_pow(dx,xy,x,y) dx = (x==0.0)?0.0:((y/x)*xy); #define _dy_pow(dy,xy,x,y) dy = (x==0.0)?0.0:((log(x)/exp(0.0))*xy); -#define _atan2(xy,x,y) xy = atan2(x,y); +#define _f_atan2(xy,x,y) xy = atan2(x,y); #define _dx_atan2(dx,x,y) dx = -(y)/((x)*(x)+(y)*(y)); #define _dy_atan2(dy,x,y) dy = (x)/((x)*(x)+(y)*(y)); -#define _div1(x,y) ((x)/(y)) -#define _div0(xy,x,y) xy=(x)/(y); -#define _div(xy,dx,x,y) dx=1/(y); xy=(x)*dx; +#define _f_div1(x,y) ((x)/(y)) +#define _f_div0(xy,x,y) xy=(x)/(y); +#define _f_div(xy,dx,x,y) dx=1/(y); xy=(x)*dx; #define _dx_div(dx,xy,x,y) #define _dy_div(dy,dx,xy,x,y) dy = -xy*dx; -#define _limexp(val,arg) val = ((arg)<(90)) ? (exp(arg)) : (exp(90)*(1.0+(arg-90))); +#define _f_limexp(val,arg) val = ((arg)<(90)) ? (exp(arg)) : (exp(90)*(1.0+(arg-90))); #define _d_limexp(val,dval,arg) val = ((arg)<(90)) ? (exp(arg)) : (exp(90)*(1.0+(arg-90))); dval = val; -#define _fabs(val,arg) val = fabs(arg); +#define _f_fabs(val,arg) val = fabs(arg); #define _d_fabs(val,dval,arg) val = fabs(arg); dval = (((val)>=0)?(+1.0):(-1.0)); -#define _abs(val) ((val)<(0) ? (-(val)):(val)) +#define _f_abs(val) ((val)<(0) ? (-(val)):(val)) /* declarations for $(module) MOSFETs */ diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml index ec4e9ce4e..4f3c17b7a 100644 --- a/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml +++ b/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml @@ -26,7 +26,7 @@ - + diff --git a/src/spicelib/devices/adms/admst/ngspiceVersion.xml b/src/spicelib/devices/adms/admst/ngspiceVersion.xml index ed85ec3ac..dc3954e99 100644 --- a/src/spicelib/devices/adms/admst/ngspiceVersion.xml +++ b/src/spicelib/devices/adms/admst/ngspiceVersion.xml @@ -1184,7 +1184,7 @@ - + @@ -1198,7 +1198,7 @@ - + @@ -1277,7 +1277,7 @@ - + @@ -1286,7 +1286,7 @@ - +