Work at SourceForge, help us to make it a better place! We have an immediate need for a Support Technician in our San Francisco or Denver office.

Close

Diff of /Real/real.pd [e99cbd] .. [591b21] Maximize Restore

  Switch to side-by-side view

--- a/Real/real.pd
+++ b/Real/real.pd
@@ -4,16 +4,14 @@
 
 do('../Config');
 
-our $VERSION = '0.08_01';
-pp_setversion(qq{'$VERSION'});
-$VERSION = eval $VERSION;
-
+our $VERSION = 0.04;
 use PDL::Exporter;
 
 
 #TODO 
 # dot
 
+pp_setversion(0.04);
 
 sub generate_code($){
 	if ($config{WITHOUT_THREAD}){
@@ -44,10 +42,6 @@
 pp_addhdr('
 #include <math.h>
 
-#if defined(PDL_CORE_VERSION) && PDL_CORE_VERSION < 10
-typedef PDL_Long PDL_Indx;
-#endif
-
 /* avoid annoying warnings */
 typedef PDL_Long logical;
 typedef PDL_Long integer;
@@ -91,8 +85,6 @@
 }
 
 
-
-=encoding Latin-1
 
 =head1 NAME
 
@@ -182,15 +174,15 @@
 		$TFD(sgesvd_,dgesvd_)(
 		&trau,
 		&travt,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(s),
 		$P(U),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(VT),
-		&(integer){$PRIV(__s_size)},
+		&$PRIV(__s_size),
 		&tmp_work,
 		&lwork,
 		$P(info));
@@ -208,15 +200,15 @@
 		$TFD(sgesvd_,dgesvd_)(
 		&trau,
 		&travt,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(s),
 		$P(U),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(VT),
-		&(integer){$PRIV(__s_size)},
+		&$PRIV(__s_size),
 		work,
 		&lwork,
 		$P(info));
@@ -356,15 +348,15 @@
 
 		$TFD(sgesdd_,dgesdd_)(
 		&tra,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(s),
 		$P(U),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(VT),
-		&(integer){$PRIV(__s_size)},
+		&$PRIV(__s_size),
 		&tmp_work,
 		&lwork,
 		iwork,
@@ -392,15 +384,15 @@
              %}
 		$TFD(sgesdd_,dgesdd_)(
 		&tra,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(s),
 		$P(U),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(VT),
-		&(integer){$PRIV(__s_size)},
+		&$PRIV(__s_size),
 		work,
 		&lwork,
 		iwork,
@@ -533,23 +525,23 @@
 		&pjobu,
 		&pjobv,
 		&pjobq,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__p_size),
 		$P(k),
 		$P(l),
 		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(B),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(alpha),
 		$P(beta),
 		$P(U),
-		&(integer){$PRIV(__q_size)},
+		&$PRIV(__q_size),
 		$P(V),
-		&(integer){$PRIV(__s_size)},
+		&$PRIV(__s_size),
 		$P(Q),
-		&(integer){$PRIV(__u_size)},
+		&$PRIV(__u_size),
 		work,
 		$P(iwork),
 		$P(info));
@@ -758,15 +750,15 @@
 		$TFD(sgeev_,dgeev_)(
 		&jvl,
 		&jvr,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(wr),
 		$P(wi),
 		$P(vl),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(vr),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		&tmp_work,
 		&lwork,
 		$P(info));
@@ -784,15 +776,15 @@
 		$TFD(sgeev_,dgeev_)(
 		&jvl,
 		&jvr,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(wr),
 		$P(wi),
 		$P(vl),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(vr),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		work,
 		&lwork,
 		$P(info));
@@ -946,15 +938,15 @@
 		&jvl,
 		&jvr,
 		&sens,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(wr),
 		$P(wi),
 		$P(vl),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(vr),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(ilo),
 		$P(ihi),
 		$P(scale),
@@ -981,15 +973,15 @@
 		&jvl,
 		&jvr,
 		&sens,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(wr),
 		$P(wi),
 		$P(vl),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(vr),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(ilo),
 		$P(ihi),
 		$P(scale),
@@ -1193,18 +1185,18 @@
 		$TFD(sggev_,dggev_)(
 		&pjobvl,
 		&pjobvr,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(alphar),
 		$P(alphai),
 		$P(beta),
 		$P(VL),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(VR),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		&tmp_work,
 		&lwork,
 		$P(info));
@@ -1221,18 +1213,18 @@
 		$TFD(sggev_,dggev_)(
 		&pjobvl,
 		&pjobvr,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(alphar),
 		$P(alphai),
 		$P(beta),
 		$P(VL),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(VR),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		work,
 		&lwork,
 		$P(info));
@@ -1409,18 +1401,18 @@
 		&pjobvl,
 		&pjobvr,
 		&psens,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(alphar),
 		$P(alphai),
 		$P(beta),
 		$P(VL),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(VR),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(ilo),
 		$P(ihi),
 		$P(lscale),
@@ -1449,18 +1441,18 @@
 		&pjobvl,
 		&pjobvr,
 		&psens,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(alphar),
 		$P(alphai),
 		$P(beta),
 		$P(VL),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(VR),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(ilo),
 		$P(ihi),
 		$P(lscale),
@@ -1799,14 +1791,14 @@
 		&jvs,
 		&psort,
 		fselection_wrapper,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(sdim),
 		$P(wr),
 		$P(wi),
 		$P(vs),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		&tmp_work,
 		&lwork,
 		bwork,
@@ -1817,14 +1809,14 @@
 		&jvs,
 		&psort,
 		dselection_wrapper,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(sdim),
 		$P(wr),
 		$P(wi),
 		$P(vs),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		&tmp_work,
 		&lwork,
 		bwork,
@@ -1847,14 +1839,14 @@
 		&jvs,
 		&psort,
 		fselection_wrapper,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(sdim),
 		$P(wr),
 		$P(wi),
 		$P(vs),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		work,
 		&lwork,
 		bwork,
@@ -1866,14 +1858,14 @@
 		&jvs,
 		&psort,
 		dselection_wrapper,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(sdim),
 		$P(wr),
 		$P(wi),
 		$P(vs),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		work,
 		&lwork,
 		bwork,
@@ -2063,14 +2055,14 @@
 		&psort,
 		dselection_wrapper,
 		&sens,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(sdim),
 		$P(wr),
 		$P(wi),
 		$P(vs),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(rconde),
 		$P(rcondv),
 		work,
@@ -2088,14 +2080,14 @@
 		&psort,
 		fselection_wrapper,
 		&sens,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(sdim),
 		$P(wr),
 		$P(wi),
 		$P(vs),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(rconde),
 		$P(rcondv),
 		work,
@@ -2342,19 +2334,19 @@
 		&pjobvsr,
 		&psort,
 		fgselection_wrapper,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(sdim),
 		$P(alphar),
 		$P(alphai),
 		$P(beta),
 		$P(VSL),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(VSR),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		&tmp_work,
 		&lwork,
 		bwork,
@@ -2366,19 +2358,19 @@
 		&pjobvsr,
 		&psort,
 		dgselection_wrapper,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(sdim),
 		$P(alphar),
 		$P(alphai),
 		$P(beta),
 		$P(VSL),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(VSR),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		&tmp_work,
 		&lwork,
 		bwork,
@@ -2399,19 +2391,19 @@
 		&pjobvsr,
 		&psort,
 		fgselection_wrapper,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(sdim),
 		$P(alphar),
 		$P(alphai),
 		$P(beta),
 		$P(VSL),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(VSR),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		work,
 		&lwork,
 		bwork,
@@ -2424,19 +2416,19 @@
 		&pjobvsr,
 		&psort,
 		dgselection_wrapper,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(sdim),
 		$P(alphar),
 		$P(alphai),
 		$P(beta),
 		$P(VSL),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(VSR),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		work,
 		&lwork,
 		bwork,
@@ -2666,14 +2658,14 @@
 		// for this feature.
 
 		minwrk = ($SIZE(n) + 1 << 3) + 16;
-		maxwrk = ($SIZE(n) + 1) * 7 + $SIZE(n) * (integer ) ilaenv_(&c__1, "DGEQRF", " ", &(integer){$PRIV(__n_size)}, &c__1,
-		&(integer){$PRIV(__n_size)}, &c__0, (ftnlen)6, (ftnlen)1) + 16;
+		maxwrk = ($SIZE(n) + 1) * 7 + $SIZE(n) * (integer ) ilaenv_(&c__1, "DGEQRF", " ", &$PRIV(__n_size), &c__1,
+		&$PRIV(__n_size), &c__0, (ftnlen)6, (ftnlen)1) + 16;
 
 		if ($jobvsl())
 		{
 			integer i__1 = maxwrk;
 			integer i__2 = minwrk + $SIZE(n) * (integer )ilaenv_(&c__1, "DORGQR"
-		    		, " ", &(integer){$PRIV(__n_size)}, &c__1, &(integer){$PRIV(__n_size)}, &c_n1, (ftnlen)6, (ftnlen)1);
+		    		, " ", &$PRIV(__n_size), &c__1, &$PRIV(__n_size), &c_n1, (ftnlen)6, (ftnlen)1);
 	    		maxwrk = (integer ) max(i__1,i__2);
 			pjobvsl = \'V\';
 		}
@@ -2688,19 +2680,19 @@
 		&psort,
 		fgselection_wrapper,
 		&psens,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(sdim),
 		$P(alphar),
 		$P(alphai),
 		$P(beta),
 		$P(VSL),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(VSR),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(rconde),
 		$P(rcondv),
 		work,
@@ -2719,19 +2711,19 @@
 		&psort,
 		dgselection_wrapper,
 		&psens,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(sdim),
 		$P(alphar),
 		$P(alphai),
 		$P(beta),
 		$P(VSL),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(VSR),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(rconde),
 		$P(rcondv),
 		work,
@@ -2968,9 +2960,9 @@
 		$TFD(ssyev_,dsyev_)(
 		&jz,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(w),
 		&tmp_work,
 		&lwork,
@@ -2989,9 +2981,9 @@
 		$TFD(ssyev_,dsyev_)(
 		&jz,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(w),
 		work,
 		&lwork,
@@ -3085,9 +3077,9 @@
 		$TFD(ssyevd_,dsyevd_)(
 		&jz,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(w),
 		&tmp_work,
 		&lwork,
@@ -3110,9 +3102,9 @@
 		$TFD(ssyevd_,dsyevd_)(
 		&jz,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(w),
 		work,
 		&lwork,
@@ -3234,9 +3226,9 @@
 		&jz,
 		&prange,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(vl),
 		$P(vu),
 		$P(il),
@@ -3245,7 +3237,7 @@
 		$P(m),
 		$P(w),
 		$P(z),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		&tmp_work,
 		&lwork,
 		iwork,
@@ -3266,9 +3258,9 @@
 		&jz,
 		&prange,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(vl),
 		$P(vu),
 		$P(il),
@@ -3277,7 +3269,7 @@
 		$P(m),
 		$P(w),
 		$P(z),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		work,
 		&lwork,
 		iwork,
@@ -3457,9 +3449,9 @@
 		&jz,
 		&prange,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(vl),
 		$P(vu),
 		$P(il),
@@ -3468,7 +3460,7 @@
 		$P(m),
 		$P(w),
 		$P(z),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(isuppz),
 		&tmp_work,
 		&lwork,
@@ -3493,9 +3485,9 @@
 		&jz,
 		&prange,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(vl),
 		$P(vu),
 		$P(il),
@@ -3504,7 +3496,7 @@
 		$P(m),
 		$P(w),
 		$P(z),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(isuppz),
 		work,
 		&lwork,
@@ -3703,11 +3695,11 @@
 		$P(itype),
 		&jz,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(w),
 		&tmp_work,
 		&lwork,
@@ -3727,11 +3719,11 @@
 		$P(itype),
 		&jz,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(w),
 		work,
 		&lwork,
@@ -3851,11 +3843,11 @@
 		$P(itype),
 		&jz,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(w),
 		&tmp_work,
 		&lwork,
@@ -3880,11 +3872,11 @@
 		$P(itype),
 		&jz,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(w),
 		work,
 		&lwork,
@@ -4027,11 +4019,11 @@
 		&jz,
 		&prange,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(vl),
 		$P(vu),
 		$P(il),
@@ -4040,7 +4032,7 @@
 		$P(m),
 		$P(w),
 		$P(Z),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		&tmp_work,
 		&lwork,
 		iwork,
@@ -4062,11 +4054,11 @@
 		&jz,
 		&prange,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(vl),
 		$P(vu),
 		$P(il),
@@ -4075,7 +4067,7 @@
 		$P(m),
 		$P(w),
 		$P(Z),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		work,
 		&lwork,
 		iwork,
@@ -4237,13 +4229,13 @@
              %}
 
 		$TFD(sgesv_,dgesv_)(
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(ipiv),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(info));
 ',
       Doc => '
@@ -4364,20 +4356,20 @@
 		$TFD(sgesvx_,dgesvx_)(
 		&pfact,
 		&ptrans,
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(af),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(ipiv),
 		&pequed,
 		$P(r),
 		$P(c),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(X),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(rcond),
 		$P(ferr),
 		$P(berr),
@@ -4664,13 +4656,13 @@
 
 		$TFD(ssysv_,dsysv_)(
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(ipiv),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
                 &tmp_work,
 		&lwork,
 		$P(info));
@@ -4688,13 +4680,13 @@
              %}
 		$TFD(ssysv_,dsysv_)(
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(ipiv),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
                 work,
 		&lwork,
 		$P(info));
@@ -4821,17 +4813,17 @@
 		$TFD(ssysvx_,dsysvx_)(
 		&pfact,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(af),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(ipiv),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(X),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(rcond),
 		$P(ferr),
 		$P(berr),
@@ -4852,17 +4844,17 @@
 		$TFD(ssysvx_,dsysvx_)(
 		&pfact,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(af),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(ipiv),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(X),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(rcond),
 		$P(ferr),
 		$P(berr),
@@ -5057,12 +5049,12 @@
 
 		$TFD(sposv_,dposv_)(
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(info));
 ',
       Doc => '
@@ -5183,18 +5175,18 @@
 		$TFD(sposvx_,dposvx_)(
 		&pfact,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(af),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		&pequed,
 		$P(s),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(X),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(rcond),
 		$P(ferr),
 		$P(berr),
@@ -5442,13 +5434,13 @@
 
 		$TFD(sgels_,dgels_)(
 		&ptrans,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__q_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__q_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(B),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		&tmp_work,
 		&lwork,
 		$P(info));
@@ -5464,13 +5456,13 @@
 
 		$TFD(sgels_,dgels_)(
 		&ptrans,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__q_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__q_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(B),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		work,
 		&lwork,
 		$P(info));
@@ -5594,13 +5586,13 @@
              %}
 
 		$TFD(sgelsy_,dgelsy_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__q_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__q_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(B),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(jpvt),
 		$P(rcond),
 		$P(rank),
@@ -5618,13 +5610,13 @@
              	%}
 
 		$TFD(sgelsy_,dgelsy_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__q_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__q_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(B),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(jpvt),
 		$P(rcond),
 		$P(rank),
@@ -5749,13 +5741,13 @@
              %}
 
 		$TFD(sgelss_,dgelss_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__q_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__q_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(B),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(s),
 		$P(rcond),
 		$P(rank),
@@ -5773,13 +5765,13 @@
              	%}
 
 		$TFD(sgelss_,dgelss_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__q_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__q_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(B),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(s),
 		$P(rcond),
 		$P(rank),
@@ -5907,13 +5899,13 @@
 
 
 		$TFD(sgelsd_,dgelsd_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__q_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__q_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(B),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(s),
 		$P(rcond),
 		$P(rank),
@@ -5932,13 +5924,13 @@
              	%}
 
 		$TFD(sgelsd_,dgelsd_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__q_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__q_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(B),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(s),
 		$P(rcond),
 		$P(rank),
@@ -6074,13 +6066,13 @@
 
 
 		$TFD(sgglse_,dgglse_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__p_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__p_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(B),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(c),
 		$P(d),
 		$P(x),
@@ -6098,13 +6090,13 @@
              	%}
 
 		$TFD(sgglse_,dgglse_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__p_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__p_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(B),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(c),
 		$P(d),
 		$P(x),
@@ -6202,13 +6194,13 @@
 
 
 		$TFD(sggglm_,dggglm_)(
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__p_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
+		&$PRIV(__p_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(d),
 		$P(x),
 		$P(y),
@@ -6226,13 +6218,13 @@
              	%}
 
 		$TFD(sggglm_,dggglm_)(
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__p_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
+		&$PRIV(__p_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(d),
 		$P(x),
 		$P(y),
@@ -6326,10 +6318,10 @@
 		lda, integer *ipiv, integer *info);
              %}
 		$TFD(sgetrf_,dgetrf_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(ipiv),
 		$P(info));
 ',
@@ -6393,10 +6385,10 @@
 		lda, integer *ipiv, integer *info);
              %}
 		$TFD(sgetf2_,dgetf2_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(ipiv),
 		$P(info));
 ',
@@ -6469,9 +6461,9 @@
 
 		$TFD(ssytrf_,dsytrf_)(
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(ipiv),
 		&tmp_work,
 		&lwork,
@@ -6487,9 +6479,9 @@
              	%}
 		$TFD(ssytrf_,dsytrf_)(
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(ipiv),
 		work,
 		&lwork,
@@ -6613,9 +6605,9 @@
 
 		$TFD(ssytf2_,dsytf2_)(
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(ipiv),
 		$P(info));
 ',
@@ -6702,9 +6694,9 @@
 
 		$TFD(spotrf_,dpotrf_)(
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(info));
 ',
       Doc => '
@@ -6775,9 +6767,9 @@
 
 		$TFD(spotf2_,dpotf2_)(
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(info));
 ',
       Doc => '
@@ -6849,9 +6841,9 @@
 
 
 		$TFD(sgetri_,dgetri_)(
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(ipiv),
 		&tmp_work,
 		&lwork,
@@ -6866,9 +6858,9 @@
 			double *work = (double *)malloc(lwork *  sizeof(double));
 		%}
 		$TFD(sgetri_,dgetri_)(
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(ipiv),
 		work,
 		&lwork,
@@ -6942,9 +6934,9 @@
 
 		$TFD(ssytri_, dsytri_)(
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(ipiv),
 		work,
 		$P(info));
@@ -7018,9 +7010,9 @@
 
 		$TFD(spotri_,dpotri_)(
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(info));
 ',
       Doc => '
@@ -7087,9 +7079,9 @@
 		$TFD(strtri_, dtrtri_)(
 		&puplo,
 		&pdiag,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(info));
 ',
       Doc => '
@@ -7163,9 +7155,9 @@
 		$TFD(strti2_, dtrti2_)(
 		&puplo,
 		&pdiag,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(info));
 ',
       Doc => '
@@ -7232,13 +7224,13 @@
 
 		$TFD(sgetrs_,dgetrs_)(
 		&transp,
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(ipiv),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(info));
 ',
       Doc => '
@@ -7305,13 +7297,13 @@
 
 		$TFD(ssytrs_,dsytrs_)(
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(ipiv),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(info));
 ',
       Doc => '
@@ -7380,12 +7372,12 @@
 
 		$TFD(spotrs_,dpotrs_)(
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(info));
 ',
       Doc => '
@@ -7457,12 +7449,12 @@
 		&puplo,
 		&ptrans,
 		&pdiag,
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(info));
 ',
       Doc => '
@@ -7558,9 +7550,9 @@
 		&ptrans,
 		&pdiag,
 		&pnormin,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(x),
 		$P(scale),
 		$P(cnorm),
@@ -7750,9 +7742,9 @@
 
 		$TFD(sgecon_,dgecon_)(
 		&pnorm,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(anorm),
 		$P(rcond),
 		work,
@@ -7833,9 +7825,9 @@
 
 		$TFD(ssycon_,dsycon_)(
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(ipiv),
 		$P(anorm),
 		$P(rcond),
@@ -7919,9 +7911,9 @@
 
 		$TFD(spocon_,dpocon_)(
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(anorm),
 		$P(rcond),
 		work,
@@ -8003,9 +7995,9 @@
 		&pnorm,
 		&puplo,
 		&pdiag,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(rcond),
 		work,
 		iwork,
@@ -8088,10 +8080,10 @@
              %}
 
 		$TFD(sgeqp3_,dgeqp3_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(jpvt),
 		$P(tau),
 		&tmp_work,
@@ -8109,10 +8101,10 @@
 		double *work = (double *)malloc(lwork *  sizeof(double));
              %}
 		$TFD(sgeqp3_,dgeqp3_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(jpvt),
 		$P(tau),
 		work,
@@ -8194,10 +8186,10 @@
              %}
 
 		$TFD(sgeqrf_,dgeqrf_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		&tmp_work,
 		&lwork,
@@ -8214,10 +8206,10 @@
 		double *work = (double *)malloc(lwork *  sizeof(double));
              %}
 		$TFD(sgeqrf_,dgeqrf_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		work,
 		&lwork,
@@ -8291,11 +8283,11 @@
              %}
 
 		$TFD(sorgqr_,dorgqr_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		&tmp_work,
 		&lwork,
@@ -8312,11 +8304,11 @@
 		double *work = (double *)malloc(lwork *  sizeof(double));
              %}
 		$TFD(sorgqr_,dorgqr_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		work,
 		&lwork,
@@ -8391,14 +8383,14 @@
 		$TFD(sormqr_,dormqr_)(
 		&pside,
 		&ptrans,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
-		$P(A),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
+		$P(A),
+		&$PRIV(__p_size),
 		$P(tau),
 		$P(C),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		&tmp_work,
 		&lwork,
 		$P(info));
@@ -8416,14 +8408,14 @@
 		$TFD(sormqr_,dormqr_)(
 		&pside,
 		&ptrans,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
-		$P(A),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
+		$P(A),
+		&$PRIV(__p_size),
 		$P(tau),
 		$P(C),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		work,
 		&lwork,
 		$P(info));
@@ -8508,10 +8500,10 @@
              %}
 
 		$TFD(sgelqf_,dgelqf_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		&tmp_work,
 		&lwork,
@@ -8528,10 +8520,10 @@
 		double *work = (double *)malloc(lwork *  sizeof(double));
              %}
 		$TFD(sgelqf_,dgelqf_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		work,
 		&lwork,
@@ -8604,11 +8596,11 @@
              %}
 
 		$TFD(sorglq_,dorglq_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		&tmp_work,
 		&lwork,
@@ -8625,11 +8617,11 @@
 		double *work = (double *)malloc(lwork *  sizeof(double));
              %}
 		$TFD(sorglq_,dorglq_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		work,
 		&lwork,
@@ -8702,14 +8694,14 @@
 		$TFD(sormlq_,dormlq_)(
 		&pside,
 		&ptrans,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
-		$P(A),
-		&(integer){$PRIV(__k_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
+		$P(A),
+		&$PRIV(__k_size),
 		$P(tau),
 		$P(C),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		&tmp_work,
 		&lwork,
 		$P(info));
@@ -8727,14 +8719,14 @@
 		$TFD(sormlq_,dormlq_)(
 		&pside,
 		&ptrans,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
-		$P(A),
-		&(integer){$PRIV(__k_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
+		$P(A),
+		&$PRIV(__k_size),
 		$P(tau),
 		$P(C),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		work,
 		&lwork,
 		$P(info));
@@ -8819,10 +8811,10 @@
              %}
 
 		$TFD(sgeqlf_,dgeqlf_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		&tmp_work,
 		&lwork,
@@ -8839,10 +8831,10 @@
 		double *work = (double *)malloc(lwork *  sizeof(double));
              %}
 		$TFD(sgeqlf_,dgeqlf_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		work,
 		&lwork,
@@ -8917,11 +8909,11 @@
              %}
 
 		$TFD(sorgql_,dorgql_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		&tmp_work,
 		&lwork,
@@ -8938,11 +8930,11 @@
 		double *work = (double *)malloc(lwork *  sizeof(double));
              %}
 		$TFD(sorgql_,dorgql_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		work,
 		&lwork,
@@ -9016,14 +9008,14 @@
 		$TFD(sormql_,dormql_)(
 		&pside,
 		&ptrans,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
-		$P(A),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
+		$P(A),
+		&$PRIV(__p_size),
 		$P(tau),
 		$P(C),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		&tmp_work,
 		&lwork,
 		$P(info));
@@ -9041,14 +9033,14 @@
 		$TFD(sormql_,dormql_)(
 		&pside,
 		&ptrans,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
-		$P(A),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
+		$P(A),
+		&$PRIV(__p_size),
 		$P(tau),
 		$P(C),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		work,
 		&lwork,
 		$P(info));
@@ -9133,10 +9125,10 @@
              %}
 
 		$TFD(sgerqf_,dgerqf_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		&tmp_work,
 		&lwork,
@@ -9153,10 +9145,10 @@
 		double *work = (double *)malloc(lwork *  sizeof(double));
              %}
 		$TFD(sgerqf_,dgerqf_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		work,
 		&lwork,
@@ -9232,11 +9224,11 @@
              %}
 
 		$TFD(sorgrq_,dorgrq_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		&tmp_work,
 		&lwork,
@@ -9253,11 +9245,11 @@
 		double *work = (double *)malloc(lwork *  sizeof(double));
              %}
 		$TFD(sorgrq_,dorgrq_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		work,
 		&lwork,
@@ -9331,14 +9323,14 @@
 		$TFD(sormrq_,dormrq_)(
 		&pside,
 		&ptrans,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
-		$P(A),
-		&(integer){$PRIV(__k_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
+		$P(A),
+		&$PRIV(__k_size),
 		$P(tau),
 		$P(C),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		&tmp_work,
 		&lwork,
 		$P(info));
@@ -9356,14 +9348,14 @@
 		$TFD(sormrq_,dormrq_)(
 		&pside,
 		&ptrans,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
-		$P(A),
-		&(integer){$PRIV(__k_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
+		$P(A),
+		&$PRIV(__k_size),
 		$P(tau),
 		$P(C),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		work,
 		&lwork,
 		$P(info));
@@ -9448,10 +9440,10 @@
              %}
 
 		$TFD(stzrzf_,dtzrzf_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		&tmp_work,
 		&lwork,
@@ -9468,10 +9460,10 @@
 		double *work = (double *)malloc(lwork *  sizeof(double));
              %}
 		$TFD(stzrzf_,dtzrzf_)(
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(tau),
 		work,
 		&lwork,
@@ -9574,15 +9566,15 @@
 		$TFD(sormrz_,dormrz_)(
 		&pside,
 		&ptrans,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
 		&kk,
 		$P(A),
-		&(integer){$PRIV(__k_size)},
+		&$PRIV(__k_size),
 		$P(tau),
 		$P(C),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		&tmp_work,
 		&lwork,
 		$P(info));
@@ -9600,15 +9592,15 @@
 		$TFD(sormrz_,dormrz_)(
 		&pside,
 		&ptrans,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__k_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		&$PRIV(__k_size),
 		&kk,
 		$P(A),
-		&(integer){$PRIV(__k_size)},
+		&$PRIV(__k_size),
 		$P(tau),
 		$P(C),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		work,
 		&lwork,
 		$P(info));
@@ -9697,11 +9689,11 @@
              %}
 
 		$TFD(sgehrd_,dgehrd_)(
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(ilo),
 		$P(ihi),
 		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(tau),
 		&tmp_work,
 		&lwork,
@@ -9718,11 +9710,11 @@
 		double *work = (double *)malloc(lwork *  sizeof(double));
              %}
 		$TFD(sgehrd_,dgehrd_)(
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(ilo),
 		$P(ihi),
 		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(tau),
 		work,
 		&lwork,
@@ -9827,11 +9819,11 @@
              %}
 
 		$TFD(sorghr_,dorghr_)(
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(ilo),
 		$P(ihi),
 		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(tau),
 		&tmp_work,
 		&lwork,
@@ -9848,11 +9840,11 @@
 		double *work = (double *)malloc(lwork *  sizeof(double));
              %}
 		$TFD(sorghr_,dorghr_)(
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(ilo),
 		$P(ihi),
 		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(tau),
 		work,
 		&lwork,
@@ -9942,15 +9934,15 @@
 		$TFD(shseqr_,dhseqr_)(
 		&pjob,
 		&pcompz,
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(ilo),
 		$P(ihi),
 		$P(H),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(wr),
 		$P(wi),
 		$P(Z),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		&tmp_work,
 		&lwork,
 		$P(info));
@@ -9968,15 +9960,15 @@
 		$TFD(shseqr_,dhseqr_)(
 		&pjob,
 		&pcompz,
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(ilo),
 		$P(ihi),
 		$P(H),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(wr),
 		$P(wi),
 		$P(Z),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		work,
 		&lwork,
 		$P(info));
@@ -10115,13 +10107,13 @@
 		&pside,
 		&phowmny,
 		$P(select),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(T),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(VL),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(VR),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		&mm,
 		$P(m), 
 		work,
@@ -10315,15 +10307,15 @@
 		&pside,
 		&phowmny,
 		$P(select),
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(B),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(VL),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(VR),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		&mm,
 		$P(m), 
 		work,
@@ -10478,9 +10470,9 @@
 		
 		$TFD(sgebal_,dgebal_)(
 		&pjob,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(ilo),
 		$P(ihi),
 		$P(scale),
@@ -10612,13 +10604,13 @@
 		$TFD(sgebak_,dgebak_)(
 		&pjob,
 		&pside,
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(ilo),
 		$P(ihi),
 		$P(scale),
-		&(integer){$PRIV(__m_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__m_size),
+		$P(A),
+		&$PRIV(__n_size),
 		$P(info));
 
 ',
@@ -10712,10 +10704,10 @@
 
 		$b() = $TFD(slange_,dlange_)(
 		&pnorm,
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
+		$P(A),
+		&$PRIV(__n_size),
 		work);
 		if ($norm() == 2)
 			free (work);
@@ -10809,9 +10801,9 @@
 		$b() = $TFD(slansy_,dlansy_)(
 		&pnorm,
 		&puplo,
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		work);
 		if ($norm() == 2 || $norm() == 1)
 			free (work);
@@ -10912,10 +10904,10 @@
 		&pnorm,
 		&puplo,
 		&pdiag,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__n_size),
 		work);
 		if ($norm() == 2)
 			free (work);
@@ -11015,17 +11007,17 @@
 		$TFD(sgemm_,dgemm_)(
 		&ptransa,
 		&ptransb,
-		&(integer){$PRIV(__r_size)},
-		&(integer){$PRIV(__s_size)},
+		&$PRIV(__r_size),
+		&$PRIV(__s_size),
 		&kk,
 		$P(alpha),
 		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(B),
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		$P(beta),
 		$P(C),
-		&(integer){$PRIV(__r_size)});
+		&$PRIV(__r_size));
 ',
       Doc => '
 
@@ -11173,17 +11165,17 @@
 		$TFD(sgemm_,dgemm_)(
 		&ptrans,
 		&ptrans,
-		&(integer){$PRIV(__p_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__p_size),
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
 		&alpha,
 		$P(B),
-		&(integer){$PRIV(__p_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__p_size),
+		$P(A),
+		&$PRIV(__m_size),
 		&beta,
 		$P(C),
-		&(integer){$PRIV(__p_size)});
+		&$PRIV(__p_size));
 ',
       Doc => '
 
@@ -11219,17 +11211,17 @@
 		$TFD(sgemmb_,dgemmb_)(
 		&ptrans,
 		&ptrans,
-		&(integer){$PRIV(__p_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__p_size),
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
 		&alpha,
 		$P(B),
-		&(integer){$PRIV(__p_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__p_size),
+		$P(A),
+		&$PRIV(__m_size),
 		&beta,
 		$P(C),
-		&(integer){$PRIV(__p_size)});
+		&$PRIV(__p_size));
 ',
       Doc => '
 
@@ -11268,17 +11260,17 @@
 		$TFD(sgemm_,dgemm_)(
 		&btrans,
 		&atrans,
-		&(integer){$PRIV(__p_size)},
-		&(integer){$PRIV(__n_size)},
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__p_size),
+		&$PRIV(__n_size),
+		&$PRIV(__m_size),
 		&alpha,
 		$P(B),
-		&(integer){$PRIV(__p_size)},
-		$P(A),
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__p_size),
+		$P(A),
+		&$PRIV(__n_size),
 		&beta,
 		$P(C),
-		&(integer){$PRIV(__p_size)});
+		&$PRIV(__p_size));
 ',
       Doc => '
 
@@ -11318,14 +11310,14 @@
 		$TFD(ssyrk_,dsyrk_)(
 		&puplo,
 		&ptrans,
-		&(integer){$PRIV(__p_size)},
+		&$PRIV(__p_size),
 		&kk,
 		$P(alpha),
 		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
 		$P(beta),
 		$P(C),
-		&(integer){$PRIV(__p_size)});
+		&$PRIV(__p_size));
 ',
       Doc => '
 
@@ -11733,7 +11725,7 @@
 
 		$TFD(slasrt_,dlasrt_)(
 		&pwork,
-		&(integer){$PRIV(__n_size)},
+		&$PRIV(__n_size),
 		$P(d),
 		$P(info));
 ',
@@ -11797,12 +11789,12 @@
 
 		$TFD(slacpy_,dlacpy_)(
 		&puplo,
-		&(integer){$PRIV(__m_size)},
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__m_size),
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(B),
-		&(integer){$PRIV(__p_size)});
+		&$PRIV(__p_size));
 ',
       Doc => '
 
@@ -11851,9 +11843,9 @@
 
 
 		$TFD(slaswp_,dlaswp_)(
-		&(integer){$PRIV(__n_size)},
-		$P(A),
-		&(integer){$PRIV(__m_size)},
+		&$PRIV(__n_size),
+		$P(A),
+		&$PRIV(__m_size),
 		$P(k1),
 		$P(k2),
 		$P(ipiv),
@@ -12304,9 +12296,9 @@
 	for (;;)
 	{
 		i++;
-		$TFD(sgemm_,dgemm_)(&ptrans,&ptrans,&(integer){$PRIV(__n_size)},&(integer){$PRIV(__n_size)},
-			&(integer){$PRIV(__n_size)},&alpha,$P(A),&(integer){$PRIV(__n_size)},	$P(Y), &(integer){$PRIV(__n_size)},
-			&beta, p, &(integer){$PRIV(__n_size)});
+		$TFD(sgemm_,dgemm_)(&ptrans,&ptrans,&$PRIV(__n_size),&$PRIV(__n_size),
+			&$PRIV(__n_size),&alpha,$P(A),&$PRIV(__n_size),	$P(Y), &$PRIV(__n_size),
+			&beta, p, &$PRIV(__n_size));
 		
 		if (i == $SIZE(n)) break;