diff --git a/lapack-netlib/SRC/chgeqz.c b/lapack-netlib/SRC/chgeqz.c index 4e6f86757..cb738aa41 100644 --- a/lapack-netlib/SRC/chgeqz.c +++ b/lapack-netlib/SRC/chgeqz.c @@ -292,18 +292,17 @@ static double dpow_ui(double x, integer n) { return pow; } #ifdef _MSC_VER -static _Fcomplex cpow_ui(_Fomplex x, integer n) { - complex pow={1.0,0.0}; unsigned long int u; +static _Fcomplex cpow_ui(_Fcomplex x, integer n) { + _Fcomplex pow={1.0,0.0}; complex tmp; unsigned long int u; if(n != 0) { if(n < 0) n = -n, x._Val[0] = 1./x._Val[0], x._Val[1]=1./x._Val[1]; for(u = n; ; ) { - if(u & 01) pow.r *= x._Val[0], pow.i *= x._Val[1]; - if(u >>= 1) x._Val[0] *= x._Val[0], x._Val[1] *= x._Val[1]; + if(u & 01) pow = _FCmulcc(pow,x); + if(u >>= 1) x = _FCmulcc(x,x); else break; } } - _Fcomplex p={pow.r, pow.i}; - return p; + return pow; } #else static _Complex float cpow_ui(_Complex float x, integer n) { @@ -325,13 +324,12 @@ static _Dcomplex zpow_ui(_Dcomplex x, integer n) { if(n != 0) { if(n < 0) n = -n, x._Val[0] = 1/x._Val[0], x._Val[1] =1/x._Val[1]; for(u = n; ; ) { - if(u & 01) pow._Val[0] *= x._Val[0], pow._Val[1] *= x._Val[1]; - if(u >>= 1) x._Val[0] *= x._Val[0], x._Val[1] *= x._Val[1]; + if(u & 01) pow = _Cmulcc(pow,x); + if(u >>= 1) x = _Cmulcc(x,x); else break; } } - _Dcomplex p = {pow._Val[0], pow._Val[1]}; - return p; + return pow; } #else static _Complex double zpow_ui(_Complex double x, integer n) { diff --git a/lapack-netlib/SRC/claesy.c b/lapack-netlib/SRC/claesy.c index 99bbb1f07..79d4047da 100644 --- a/lapack-netlib/SRC/claesy.c +++ b/lapack-netlib/SRC/claesy.c @@ -292,18 +292,17 @@ static double dpow_ui(double x, integer n) { return pow; } #ifdef _MSC_VER -static _Fcomplex cpow_ui(complex x, integer n) { - complex pow={1.0,0.0}; unsigned long int u; +static _Fcomplex cpow_ui(_Fcomplex x, integer n) { + _Fcomplex pow={1.0,0.0}; unsigned long int u; if(n != 0) { - if(n < 0) n = -n, x.r = 1/x.r, x.i=1/x.i; + if(n < 0) n = -n, x._Val[0] = 1/x._Val[0], x._Val[1]=1/x._Val[1]; for(u = n; ; ) { - if(u & 01) pow.r *= x.r, pow.i *= x.i; - if(u >>= 1) x.r *= x.r, x.i *= x.i; + if(u & 01) pow = _FCmulcc(pow,x) ; + if(u >>= 1) x = _FCmulcc(x,x); else break; } } - _Fcomplex p={pow.r, pow.i}; - return p; + return pow; } #else static _Complex float cpow_ui(_Complex float x, integer n) { @@ -325,13 +324,12 @@ static _Dcomplex zpow_ui(_Dcomplex x, integer n) { if(n != 0) { if(n < 0) n = -n, x._Val[0] = 1/x._Val[0], x._Val[1] =1/x._Val[1]; for(u = n; ; ) { - if(u & 01) pow._Val[0] *= x._Val[0], pow._Val[1] *= x._Val[1]; - if(u >>= 1) x._Val[0] *= x._Val[0], x._Val[1] *= x._Val[1]; + if(u & 01) pow = _Cmulcc(pow,x); + if(u >>= 1) x = _Cmulcc(x,x); else break; } } - _Dcomplex p = {pow._Val[0], pow._Val[1]}; - return p; + return pow; } #else static _Complex double zpow_ui(_Complex double x, integer n) { diff --git a/lapack-netlib/SRC/clahqr.c b/lapack-netlib/SRC/clahqr.c index f801ae059..076c3eaee 100644 --- a/lapack-netlib/SRC/clahqr.c +++ b/lapack-netlib/SRC/clahqr.c @@ -292,18 +292,17 @@ static double dpow_ui(double x, integer n) { return pow; } #ifdef _MSC_VER -static _Fcomplex cpow_ui(complex x, integer n) { - complex pow={1.0,0.0}; unsigned long int u; +static _Fcomplex cpow_ui(_Fcomplex x, integer n) { + _Fcomplex pow={1.0,0.0}; unsigned long int u; if(n != 0) { if(n < 0) n = -n, x.r = 1/x.r, x.i=1/x.i; for(u = n; ; ) { - if(u & 01) pow.r *= x.r, pow.i *= x.i; - if(u >>= 1) x.r *= x.r, x.i *= x.i; + if(u & 01) pow = _FCmulcc (pow,x); + if(u >>= 1) x = _FCmulcc (x,x); else break; } } - _Fcomplex p={pow.r, pow.i}; - return p; + return pow; } #else static _Complex float cpow_ui(_Complex float x, integer n) { diff --git a/lapack-netlib/SRC/cpstf2.c b/lapack-netlib/SRC/cpstf2.c index 5c6f04e28..5e6ed763e 100644 --- a/lapack-netlib/SRC/cpstf2.c +++ b/lapack-netlib/SRC/cpstf2.c @@ -256,7 +256,7 @@ static char junk[] = "\n@(#)LIBF77 VERSION 19990503\n"; #define myceiling_(w) {ceil(w)} #define myhuge_(w) {HUGE_VAL} //#define mymaxloc_(w,s,e,n) {if (sizeof(*(w)) == sizeof(double)) dmaxloc_((w),*(s),*(e),n); else dmaxloc_((w),*(s),*(e),n);} -#define mymaxloc_(w,s,e,n) {dmaxloc_(w,*(s),*(e),n)} +#define mymaxloc_(w,s,e,n) dmaxloc_(w,*(s),*(e),n) /* procedure parameter types for -A and -C++ */ diff --git a/lapack-netlib/SRC/cpstrf.c b/lapack-netlib/SRC/cpstrf.c index 3a7fe5df4..cb1bbd3fd 100644 --- a/lapack-netlib/SRC/cpstrf.c +++ b/lapack-netlib/SRC/cpstrf.c @@ -256,7 +256,7 @@ static char junk[] = "\n@(#)LIBF77 VERSION 19990503\n"; #define myceiling_(w) {ceil(w)} #define myhuge_(w) {HUGE_VAL} //#define mymaxloc_(w,s,e,n) {if (sizeof(*(w)) == sizeof(double)) dmaxloc_((w),*(s),*(e),n); else dmaxloc_((w),*(s),*(e),n);} -#define mymaxloc_(w,s,e,n) {dmaxloc_(w,*(s),*(e),n)} +#define mymaxloc_(w,s,e,n) dmaxloc_(w,*(s),*(e),n) /* procedure parameter types for -A and -C++ */ diff --git a/lapack-netlib/SRC/dpstf2.c b/lapack-netlib/SRC/dpstf2.c index 7fba4b1a9..c08e9bc0a 100644 --- a/lapack-netlib/SRC/dpstf2.c +++ b/lapack-netlib/SRC/dpstf2.c @@ -256,7 +256,7 @@ static char junk[] = "\n@(#)LIBF77 VERSION 19990503\n"; #define myceiling_(w) {ceil(w)} #define myhuge_(w) {HUGE_VAL} //#define mymaxloc_(w,s,e,n) {if (sizeof(*(w)) == sizeof(double)) dmaxloc_((w),*(s),*(e),n); else dmaxloc_((w),*(s),*(e),n);} -#define mymaxloc_(w,s,e,n) {dmaxloc_(w,*(s),*(e),n)} +#define mymaxloc_(w,s,e,n) dmaxloc_(w,*(s),*(e),n) /* procedure parameter types for -A and -C++ */ diff --git a/lapack-netlib/SRC/dpstrf.c b/lapack-netlib/SRC/dpstrf.c index 9ffbe013e..f9449e3aa 100644 --- a/lapack-netlib/SRC/dpstrf.c +++ b/lapack-netlib/SRC/dpstrf.c @@ -256,7 +256,7 @@ static char junk[] = "\n@(#)LIBF77 VERSION 19990503\n"; #define myceiling_(w) {ceil(w)} #define myhuge_(w) {HUGE_VAL} //#define mymaxloc_(w,s,e,n) {if (sizeof(*(w)) == sizeof(double)) dmaxloc_((w),*(s),*(e),n); else dmaxloc_((w),*(s),*(e),n);} -#define mymaxloc_(w,s,e,n) {dmaxloc_(w,*(s),*(e),n)} +#define mymaxloc_(w,s,e,n) dmaxloc_(w,*(s),*(e),n) /* procedure parameter types for -A and -C++ */ diff --git a/lapack-netlib/SRC/spstf2.c b/lapack-netlib/SRC/spstf2.c index ce433f975..c6ad41eb6 100644 --- a/lapack-netlib/SRC/spstf2.c +++ b/lapack-netlib/SRC/spstf2.c @@ -256,7 +256,7 @@ static char junk[] = "\n@(#)LIBF77 VERSION 19990503\n"; #define myceiling_(w) {ceil(w)} #define myhuge_(w) {HUGE_VAL} //#define mymaxloc_(w,s,e,n) {if (sizeof(*(w)) == sizeof(double)) dmaxloc_((w),*(s),*(e),n); else dmaxloc_((w),*(s),*(e),n);} -#define mymaxloc_(w,s,e,n) {dmaxloc_(w,*(s),*(e),n)} +#define mymaxloc_(w,s,e,n) dmaxloc_(w,*(s),*(e),n) /* procedure parameter types for -A and -C++ */ diff --git a/lapack-netlib/SRC/spstrf.c b/lapack-netlib/SRC/spstrf.c index 9a1a9be1f..13d2c041f 100644 --- a/lapack-netlib/SRC/spstrf.c +++ b/lapack-netlib/SRC/spstrf.c @@ -256,7 +256,7 @@ static char junk[] = "\n@(#)LIBF77 VERSION 19990503\n"; #define myceiling_(w) {ceil(w)} #define myhuge_(w) {HUGE_VAL} //#define mymaxloc_(w,s,e,n) {if (sizeof(*(w)) == sizeof(double)) dmaxloc_((w),*(s),*(e),n); else dmaxloc_((w),*(s),*(e),n);} -#define mymaxloc_(w,s,e,n) {dmaxloc_(w,*(s),*(e),n)} +#define mymaxloc_(w,s,e,n) dmaxloc_(w,*(s),*(e),n) /* procedure parameter types for -A and -C++ */ diff --git a/lapack-netlib/SRC/zgesc2.c b/lapack-netlib/SRC/zgesc2.c index d7164dddf..e88073766 100644 --- a/lapack-netlib/SRC/zgesc2.c +++ b/lapack-netlib/SRC/zgesc2.c @@ -191,7 +191,7 @@ typedef struct Namelist Namelist; #define c_cos(R,Z) { pCf(R)=ccos(Cf(Z)); } #ifdef _MSC_VER #define c_div(c, a, b) {Cf(c)._Val[0] = (Cf(a)._Val[0]/Cf(b)._Val[0]); Cf(c)._Val[1]=(Cf(a)._Val[1]/Cf(b)._Val[1]);} -#define z_div(c, a, b) {Cd(c)._Val[0] = (Cd(a)._Val[0]/Cd(b)._Val[0]); Cd(c)._Val[1]=(Cd(a)._Val[1]/df(b)._Val[1]);} +#define z_div(c, a, b) {Cd(c)._Val[0] = (Cd(a)._Val[0]/Cd(b)._Val[0]); Cd(c)._Val[1]=(Cd(a)._Val[1]/Cd(b)._Val[1]);} #else #define c_div(c, a, b) {pCf(c) = Cf(a)/Cf(b);} #define z_div(c, a, b) {pCd(c) = Cd(a)/Cd(b);} diff --git a/lapack-netlib/SRC/zlaed0.c b/lapack-netlib/SRC/zlaed0.c index 564f6dd37..37bd12b01 100644 --- a/lapack-netlib/SRC/zlaed0.c +++ b/lapack-netlib/SRC/zlaed0.c @@ -325,13 +325,12 @@ static _Dcomplex zpow_ui(_Dcomplex x, integer n) { if(n != 0) { if(n < 0) n = -n, x._Val[0] = 1/x._Val[0], x._Val[1] =1/x._Val[1]; for(u = n; ; ) { - if(u & 01) pow._Val[0] *= x._Val[0], pow._Val[1] *= x._Val[1]; - if(u >>= 1) x._Val[0] *= x._Val[0], x._Val[1] *= x._Val[1]; + if(u & 01) pow = _Cmulcc(pow, x); + if(u >>= 1) x = _Cmulcc(x, x); else break; } } - _Dcomplex p = {pow._Val[0], pow._Val[1]}; - return p; + return pow; } #else static _Complex double zpow_ui(_Complex double x, integer n) { diff --git a/lapack-netlib/SRC/zlaed7.c b/lapack-netlib/SRC/zlaed7.c index 4ad7b5740..093051917 100644 --- a/lapack-netlib/SRC/zlaed7.c +++ b/lapack-netlib/SRC/zlaed7.c @@ -325,13 +325,12 @@ static _Dcomplex zpow_ui(_Dcomplex x, integer n) { if(n != 0) { if(n < 0) n = -n, x._Val[0] = 1/x._Val[0], x._Val[1] =1/x._Val[1]; for(u = n; ; ) { - if(u & 01) pow._Val[0] *= x._Val[0], pow._Val[1] *= x._Val[1]; - if(u >>= 1) x._Val[0] *= x._Val[0], x._Val[1] *= x._Val[1]; + if(u & 01) pow = _Cmulcc(pow, x); + if(u >>= 1) x = _Cmulcc(x, x); else break; } } - _Dcomplex p = {pow._Val[0], pow._Val[1]}; - return p; + return pow; } #else static _Complex double zpow_ui(_Complex double x, integer n) { diff --git a/lapack-netlib/SRC/zpstf2.c b/lapack-netlib/SRC/zpstf2.c index dd27b48ab..ad3f89b2d 100644 --- a/lapack-netlib/SRC/zpstf2.c +++ b/lapack-netlib/SRC/zpstf2.c @@ -256,7 +256,7 @@ static char junk[] = "\n@(#)LIBF77 VERSION 19990503\n"; #define myceiling_(w) {ceil(w)} #define myhuge_(w) {HUGE_VAL} //#define mymaxloc_(w,s,e,n) {if (sizeof(*(w)) == sizeof(double)) dmaxloc_((w),*(s),*(e),n); else dmaxloc_((w),*(s),*(e),n);} -#define mymaxloc_(w,s,e,n) {dmaxloc_(w,*(s),*(e),n)} +#define mymaxloc_(w,s,e,n) dmaxloc_(w,*(s),*(e),n) /* procedure parameter types for -A and -C++ */ diff --git a/lapack-netlib/SRC/zpstrf.c b/lapack-netlib/SRC/zpstrf.c index e1336cf95..d84e7566b 100644 --- a/lapack-netlib/SRC/zpstrf.c +++ b/lapack-netlib/SRC/zpstrf.c @@ -256,7 +256,7 @@ static char junk[] = "\n@(#)LIBF77 VERSION 19990503\n"; #define myceiling_(w) {ceil(w)} #define myhuge_(w) {HUGE_VAL} //#define mymaxloc_(w,s,e,n) {if (sizeof(*(w)) == sizeof(double)) dmaxloc_((w),*(s),*(e),n); else dmaxloc_((w),*(s),*(e),n);} -#define mymaxloc_(w,s,e,n) {dmaxloc_(w,*(s),*(e),n)} +#define mymaxloc_(w,s,e,n) dmaxloc_(w,*(s),*(e),n) /* procedure parameter types for -A and -C++ */ diff --git a/lapack-netlib/SRC/zstedc.c b/lapack-netlib/SRC/zstedc.c index 06de90abd..4cfc41840 100644 --- a/lapack-netlib/SRC/zstedc.c +++ b/lapack-netlib/SRC/zstedc.c @@ -325,13 +325,12 @@ static _Dcomplex zpow_ui(_Dcomplex x, integer n) { if(n != 0) { if(n < 0) n = -n, x._Val[0] = 1/x._Val[0], x._Val[1] =1/x._Val[1]; for(u = n; ; ) { - if(u & 01) pow._Val[0] *= x._Val[0], pow._Val[1] *= x._Val[1]; - if(u >>= 1) x._Val[0] *= x._Val[0], x._Val[1] *= x._Val[1]; + if(u & 01) pow = _Cmulcc(pow, x); + if(u >>= 1) x = _Cmulcc(x, x); else break; } } - _Dcomplex p = {pow._Val[0], pow._Val[1]}; - return p; + return pow; } #else static _Complex double zpow_ui(_Complex double x, integer n) {