Commit 201fb5bdfa338b7954c2797d4917fea85bc53785 - lapack

cblas64-test.patch: new patch, fixes test failure on 64-bit big endian archs Sébastien Villemot 1 year, 5 months ago

2 changed file(s) with 2196 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all

+2195

-0

debian/patches/cblas64-test.patch less more

	0	Description: Fix CBLAS tests with 64-bit indexing
	1	This patch replaces all instances of “int” by “CBLAS_INT” in CBLAS/testing/*.c
	2	(except for RowMajorStrg which has must remain an “int”, since it is declared
	3	as such in CBLAS main code).
	4	.
	5	Interestingly, the bug would not manifest on low endian architectures,
	6	because interpreting an int64_t pointer as an int32_t pointer works there (as
	7	long as the integers fits in 31 bits, which is the case here). But on big
	8	endian architectures, this of course fails badly.
	9	Author: Sébastien Villemot <sebastien@debian.org>
	10	Forwarded: https://github.com/Reference-LAPACK/lapack/pull/767
	11	Last-Update: 2022-11-27
	12	---
	13	This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
	14	--- a/CBLAS/testing/c_c2chke.c
	15	+++ b/CBLAS/testing/c_c2chke.c
	16	@@ -3,8 +3,8 @@
	17	#include "cblas.h"
	18	#include "cblas_test.h"
	19
	20	-int cblas_ok, cblas_lerr, cblas_info;
	21	-int link_xerbla=TRUE;
	22	+CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
	23	+CBLAS_INT link_xerbla=TRUE;
	24	char *cblas_rout;
	25
	26	#ifdef F77_Char
	27	@@ -14,8 +14,8 @@ void F77_xerbla(char srname, void vinf
	28	#endif
	29
	30	void chkxer(void) {
	31	- extern int cblas_ok, cblas_lerr, cblas_info;
	32	- extern int link_xerbla;
	33	+ extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
	34	+ extern CBLAS_INT link_xerbla;
	35	extern char *cblas_rout;
	36	if (cblas_lerr == 1 ) {
	37	printf("*** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s ***\n", cblas_info, cblas_rout);
	38	@@ -32,7 +32,7 @@ void F77_c2chke(char *rout) {
	39	ALPHA[2] = {0.0,0.0},
	40	BETA[2] = {0.0,0.0},
	41	RALPHA = 0.0;
	42	- extern int cblas_info, cblas_lerr, cblas_ok;
	43	+ extern CBLAS_INT cblas_info, cblas_lerr, cblas_ok;
	44	extern int RowMajorStrg;
	45	extern char *cblas_rout;
	46
	47	--- a/CBLAS/testing/c_c3chke.c
	48	+++ b/CBLAS/testing/c_c3chke.c
	49	@@ -3,8 +3,8 @@
	50	#include "cblas.h"
	51	#include "cblas_test.h"
	52
	53	-int cblas_ok, cblas_lerr, cblas_info;
	54	-int link_xerbla=TRUE;
	55	+CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
	56	+CBLAS_INT link_xerbla=TRUE;
	57	char *cblas_rout;
	58
	59	#ifdef F77_Char
	60	@@ -14,8 +14,8 @@ void F77_xerbla(char srname, void vinf
	61	#endif
	62
	63	void chkxer(void) {
	64	- extern int cblas_ok, cblas_lerr, cblas_info;
	65	- extern int link_xerbla;
	66	+ extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
	67	+ extern CBLAS_INT link_xerbla;
	68	extern char *cblas_rout;
	69	if (cblas_lerr == 1 ) {
	70	printf("*** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s ***\n", cblas_info, cblas_rout);
	71	@@ -32,7 +32,7 @@ void F77_c3chke(char * rout) {
	72	ALPHA[2] = {0.0,0.0},
	73	BETA[2] = {0.0,0.0},
	74	RALPHA = 0.0, RBETA = 0.0;
	75	- extern int cblas_info, cblas_lerr, cblas_ok;
	76	+ extern CBLAS_INT cblas_info, cblas_lerr, cblas_ok;
	77	extern int RowMajorStrg;
	78	extern char *cblas_rout;
	79
	80	--- a/CBLAS/testing/c_cblas1.c
	81	+++ b/CBLAS/testing/c_cblas1.c
	82	@@ -8,67 +8,67 @@
	83	*/
	84	#include "cblas_test.h"
	85	#include "cblas.h"
	86	-void F77_caxpy(const int N, const void alpha, void *X,
	87	- const int incX, void Y, const int *incY)
	88	+void F77_caxpy(const CBLAS_INT N, const void alpha, void *X,
	89	+ const CBLAS_INT incX, void Y, const CBLAS_INT *incY)
	90	{
	91	cblas_caxpy(N, alpha, X, incX, Y, *incY);
	92	return;
	93	}
	94
	95	-void F77_ccopy(const int N, void X, const int *incX,
	96	- void Y, const int incY)
	97	+void F77_ccopy(const CBLAS_INT N, void X, const CBLAS_INT *incX,
	98	+ void Y, const CBLAS_INT incY)
	99	{
	100	cblas_ccopy(N, X, incX, Y, *incY);
	101	return;
	102	}
	103
	104	-void F77_cdotc(const int N, void X, const int *incX,
	105	- void Y, const int incY, void *dotc)
	106	+void F77_cdotc(const CBLAS_INT N, void X, const CBLAS_INT *incX,
	107	+ void Y, const CBLAS_INT incY, void *dotc)
	108	{
	109	cblas_cdotc_sub(N, X, incX, Y, *incY, dotc);
	110	return;
	111	}
	112
	113	-void F77_cdotu(const int N, void X, const int *incX,
	114	- void Y, const int incY,void *dotu)
	115	+void F77_cdotu(const CBLAS_INT N, void X, const CBLAS_INT *incX,
	116	+ void Y, const CBLAS_INT incY,void *dotu)
	117	{
	118	cblas_cdotu_sub(N, X, incX, Y, *incY, dotu);
	119	return;
	120	}
	121
	122	-void F77_cscal(const int N, const void alpha, void X,
	123	- const int *incX)
	124	+void F77_cscal(const CBLAS_INT N, const void alpha, void X,
	125	+ const CBLAS_INT *incX)
	126	{
	127	cblas_cscal(N, alpha, X, incX);
	128	return;
	129	}
	130
	131	-void F77_csscal(const int N, const float alpha, void *X,
	132	- const int *incX)
	133	+void F77_csscal(const CBLAS_INT N, const float alpha, void *X,
	134	+ const CBLAS_INT *incX)
	135	{
	136	cblas_csscal(N, alpha, X, *incX);
	137	return;
	138	}
	139
	140	-void F77_cswap( const int N, void X, const int *incX,
	141	- void Y, const int incY)
	142	+void F77_cswap( const CBLAS_INT N, void X, const CBLAS_INT *incX,
	143	+ void Y, const CBLAS_INT incY)
	144	{
	145	cblas_cswap(N,X,incX,Y,*incY);
	146	return;
	147	}
	148
	149	-int F77_icamax(const int N, const void X, const int *incX)
	150	+CBLAS_INT F77_icamax(const CBLAS_INT N, const void X, const CBLAS_INT *incX)
	151	{
	152	if (N < 1 \|\| incX < 1) return(0);
	153	return (cblas_icamax(N, X, incX)+1);
	154	}
	155
	156	-float F77_scnrm2(const int N, const void X, const int *incX)
	157	+float F77_scnrm2(const CBLAS_INT N, const void X, const CBLAS_INT *incX)
	158	{
	159	return cblas_scnrm2(N, X, incX);
	160	}
	161
	162	-float F77_scasum(const int N, void X, const int *incX)
	163	+float F77_scasum(const CBLAS_INT N, void X, const CBLAS_INT *incX)
	164	{
	165	return cblas_scasum(N, X, incX);
	166	}
	167	--- a/CBLAS/testing/c_cblas2.c
	168	+++ b/CBLAS/testing/c_cblas2.c
	169	@@ -8,13 +8,13 @@
	170	#include "cblas.h"
	171	#include "cblas_test.h"
	172
	173	-void F77_cgemv(int layout, char transp, int m, int n,
	174	+void F77_cgemv(CBLAS_INT layout, char transp, CBLAS_INT m, CBLAS_INT n,
	175	const void *alpha,
	176	- CBLAS_TEST_COMPLEX a, int lda, const void x, int incx,
	177	- const void beta, void y, int *incy) {
	178	+ CBLAS_TEST_COMPLEX a, CBLAS_INT lda, const void x, CBLAS_INT incx,
	179	+ const void beta, void y, CBLAS_INT *incy) {
	180
	181	CBLAS_TEST_COMPLEX *A;
	182	- int i,j,LDA;
	183	+ CBLAS_INT i,j,LDA;
	184	CBLAS_TRANSPOSE trans;
	185
	186	get_transpose_type(transp, &trans);
	187	@@ -38,13 +38,13 @@ void F77_cgemv(int layout, char transp
	188	m, n, alpha, a, lda, x, incx, beta, y, *incy );
	189	}
	190
	191	-void F77_cgbmv(int layout, char transp, int m, int n, int kl, int ku,
	192	- CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a, int *lda,
	193	- CBLAS_TEST_COMPLEX x, int incx,
	194	- CBLAS_TEST_COMPLEX beta, CBLAS_TEST_COMPLEX y, int *incy) {
	195	+void F77_cgbmv(CBLAS_INT layout, char transp, CBLAS_INT m, CBLAS_INT n, CBLAS_INT kl, CBLAS_INT ku,
	196	+ CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a, CBLAS_INT *lda,
	197	+ CBLAS_TEST_COMPLEX x, CBLAS_INT incx,
	198	+ CBLAS_TEST_COMPLEX beta, CBLAS_TEST_COMPLEX y, CBLAS_INT *incy) {
	199
	200	CBLAS_TEST_COMPLEX *A;
	201	- int i,j,irow,jcol,LDA;
	202	+ CBLAS_INT i,j,irow,jcol,LDA;
	203	CBLAS_TRANSPOSE trans;
	204
	205	get_transpose_type(transp, &trans);
	206	@@ -85,12 +85,12 @@ void F77_cgbmv(int layout, char transp
	207	incx, beta, y, incy );
	208	}
	209
	210	-void F77_cgeru(int layout, int m, int n, CBLAS_TEST_COMPLEX alpha,
	211	- CBLAS_TEST_COMPLEX x, int incx, CBLAS_TEST_COMPLEX y, int incy,
	212	- CBLAS_TEST_COMPLEX a, int lda){
	213	+void F77_cgeru(CBLAS_INT layout, CBLAS_INT m, CBLAS_INT n, CBLAS_TEST_COMPLEX alpha,
	214	+ CBLAS_TEST_COMPLEX x, CBLAS_INT incx, CBLAS_TEST_COMPLEX y, CBLAS_INT incy,
	215	+ CBLAS_TEST_COMPLEX a, CBLAS_INT lda){
	216
	217	CBLAS_TEST_COMPLEX *A;
	218	- int i,j,LDA;
	219	+ CBLAS_INT i,j,LDA;
	220
	221	if (*layout == TEST_ROW_MJR) {
	222	LDA = *n+1;
	223	@@ -114,11 +114,11 @@ void F77_cgeru(int layout, int m, int
	224	cblas_cgeru( UNDEFINED, m, n, alpha, x, incx, y, incy, a, *lda );
	225	}
	226
	227	-void F77_cgerc(int layout, int m, int n, CBLAS_TEST_COMPLEX alpha,
	228	- CBLAS_TEST_COMPLEX x, int incx, CBLAS_TEST_COMPLEX y, int incy,
	229	- CBLAS_TEST_COMPLEX a, int lda) {
	230	+void F77_cgerc(CBLAS_INT layout, CBLAS_INT m, CBLAS_INT n, CBLAS_TEST_COMPLEX alpha,
	231	+ CBLAS_TEST_COMPLEX x, CBLAS_INT incx, CBLAS_TEST_COMPLEX y, CBLAS_INT incy,
	232	+ CBLAS_TEST_COMPLEX a, CBLAS_INT lda) {
	233	CBLAS_TEST_COMPLEX *A;
	234	- int i,j,LDA;
	235	+ CBLAS_INT i,j,LDA;
	236
	237	if (*layout == TEST_ROW_MJR) {
	238	LDA = *n+1;
	239	@@ -142,12 +142,12 @@ void F77_cgerc(int layout, int m, int
	240	cblas_cgerc( UNDEFINED, m, n, alpha, x, incx, y, incy, a, *lda );
	241	}
	242
	243	-void F77_chemv(int layout, char uplow, int n, CBLAS_TEST_COMPLEX alpha,
	244	- CBLAS_TEST_COMPLEX a, int lda, CBLAS_TEST_COMPLEX *x,
	245	- int incx, CBLAS_TEST_COMPLEX beta, CBLAS_TEST_COMPLEX y, int incy){
	246	+void F77_chemv(CBLAS_INT layout, char uplow, CBLAS_INT n, CBLAS_TEST_COMPLEX alpha,
	247	+ CBLAS_TEST_COMPLEX a, CBLAS_INT lda, CBLAS_TEST_COMPLEX *x,
	248	+ CBLAS_INT incx, CBLAS_TEST_COMPLEX beta, CBLAS_TEST_COMPLEX y, CBLAS_INT incy){
	249
	250	CBLAS_TEST_COMPLEX *A;
	251	- int i,j,LDA;
	252	+ CBLAS_INT i,j,LDA;
	253	CBLAS_UPLO uplo;
	254
	255	get_uplo_type(uplow,&uplo);
	256	@@ -172,13 +172,13 @@ void F77_chemv(int layout, char uplow,
	257	beta, y, *incy );
	258	}
	259
	260	-void F77_chbmv(int layout, char uplow, int n, int k,
	261	- CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a, int *lda,
	262	- CBLAS_TEST_COMPLEX x, int incx, CBLAS_TEST_COMPLEX *beta,
	263	- CBLAS_TEST_COMPLEX y, int incy){
	264	+void F77_chbmv(CBLAS_INT layout, char uplow, CBLAS_INT n, CBLAS_INT k,
	265	+ CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a, CBLAS_INT *lda,
	266	+ CBLAS_TEST_COMPLEX x, CBLAS_INT incx, CBLAS_TEST_COMPLEX *beta,
	267	+ CBLAS_TEST_COMPLEX y, CBLAS_INT incy){
	268
	269	CBLAS_TEST_COMPLEX *A;
	270	-int i,irow,j,jcol,LDA;
	271	+CBLAS_INT i,irow,j,jcol,LDA;
	272
	273	CBLAS_UPLO uplo;
	274
	275	@@ -236,12 +236,12 @@ int i,irow,j,jcol,LDA;
	276	beta, y, *incy );
	277	}
	278
	279	-void F77_chpmv(int layout, char uplow, int n, CBLAS_TEST_COMPLEX alpha,
	280	- CBLAS_TEST_COMPLEX ap, CBLAS_TEST_COMPLEX x, int *incx,
	281	- CBLAS_TEST_COMPLEX beta, CBLAS_TEST_COMPLEX y, int *incy){
	282	+void F77_chpmv(CBLAS_INT layout, char uplow, CBLAS_INT n, CBLAS_TEST_COMPLEX alpha,
	283	+ CBLAS_TEST_COMPLEX ap, CBLAS_TEST_COMPLEX x, CBLAS_INT *incx,
	284	+ CBLAS_TEST_COMPLEX beta, CBLAS_TEST_COMPLEX y, CBLAS_INT *incy){
	285
	286	CBLAS_TEST_COMPLEX A, AP;
	287	- int i,j,k,LDA;
	288	+ CBLAS_INT i,j,k,LDA;
	289	CBLAS_UPLO uplo;
	290
	291	get_uplo_type(uplow,&uplo);
	292	@@ -292,11 +292,11 @@ void F77_chpmv(int layout, char uplow,
	293	*incy );
	294	}
	295
	296	-void F77_ctbmv(int layout, char uplow, char transp, char diagn,
	297	- int n, int k, CBLAS_TEST_COMPLEX a, int lda, CBLAS_TEST_COMPLEX *x,
	298	- int *incx) {
	299	+void F77_ctbmv(CBLAS_INT layout, char uplow, char transp, char diagn,
	300	+ CBLAS_INT n, CBLAS_INT k, CBLAS_TEST_COMPLEX a, CBLAS_INT lda, CBLAS_TEST_COMPLEX *x,
	301	+ CBLAS_INT *incx) {
	302	CBLAS_TEST_COMPLEX *A;
	303	- int irow, jcol, i, j, LDA;
	304	+ CBLAS_INT irow, jcol, i, j, LDA;
	305	CBLAS_TRANSPOSE trans;
	306	CBLAS_UPLO uplo;
	307	CBLAS_DIAG diag;
	308	@@ -355,12 +355,12 @@ void F77_ctbmv(int layout, char uplow,
	309	cblas_ctbmv(UNDEFINED, uplo, trans, diag, n, k, a, lda, x, incx);
	310	}
	311
	312	-void F77_ctbsv(int layout, char uplow, char transp, char diagn,
	313	- int n, int k, CBLAS_TEST_COMPLEX a, int lda, CBLAS_TEST_COMPLEX *x,
	314	- int *incx) {
	315	+void F77_ctbsv(CBLAS_INT layout, char uplow, char transp, char diagn,
	316	+ CBLAS_INT n, CBLAS_INT k, CBLAS_TEST_COMPLEX a, CBLAS_INT lda, CBLAS_TEST_COMPLEX *x,
	317	+ CBLAS_INT *incx) {
	318
	319	CBLAS_TEST_COMPLEX *A;
	320	- int irow, jcol, i, j, LDA;
	321	+ CBLAS_INT irow, jcol, i, j, LDA;
	322	CBLAS_TRANSPOSE trans;
	323	CBLAS_UPLO uplo;
	324	CBLAS_DIAG diag;
	325	@@ -419,10 +419,10 @@ void F77_ctbsv(int layout, char uplow,
	326	cblas_ctbsv(UNDEFINED, uplo, trans, diag, n, k, a, lda, x, incx);
	327	}
	328
	329	-void F77_ctpmv(int layout, char uplow, char transp, char diagn,
	330	- int n, CBLAS_TEST_COMPLEX ap, CBLAS_TEST_COMPLEX x, int incx) {
	331	+void F77_ctpmv(CBLAS_INT layout, char uplow, char transp, char diagn,
	332	+ CBLAS_INT n, CBLAS_TEST_COMPLEX ap, CBLAS_TEST_COMPLEX x, CBLAS_INT incx) {
	333	CBLAS_TEST_COMPLEX A, AP;
	334	- int i, j, k, LDA;
	335	+ CBLAS_INT i, j, k, LDA;
	336	CBLAS_TRANSPOSE trans;
	337	CBLAS_UPLO uplo;
	338	CBLAS_DIAG diag;
	339	@@ -474,10 +474,10 @@ void F77_ctpmv(int layout, char uplow,
	340	cblas_ctpmv( UNDEFINED, uplo, trans, diag, n, ap, x, incx );
	341	}
	342
	343	-void F77_ctpsv(int layout, char uplow, char transp, char diagn,
	344	- int n, CBLAS_TEST_COMPLEX ap, CBLAS_TEST_COMPLEX x, int incx) {
	345	+void F77_ctpsv(CBLAS_INT layout, char uplow, char transp, char diagn,
	346	+ CBLAS_INT n, CBLAS_TEST_COMPLEX ap, CBLAS_TEST_COMPLEX x, CBLAS_INT incx) {
	347	CBLAS_TEST_COMPLEX A, AP;
	348	- int i, j, k, LDA;
	349	+ CBLAS_INT i, j, k, LDA;
	350	CBLAS_TRANSPOSE trans;
	351	CBLAS_UPLO uplo;
	352	CBLAS_DIAG diag;
	353	@@ -529,11 +529,11 @@ void F77_ctpsv(int layout, char uplow,
	354	cblas_ctpsv( UNDEFINED, uplo, trans, diag, n, ap, x, incx );
	355	}
	356
	357	-void F77_ctrmv(int layout, char uplow, char transp, char diagn,
	358	- int n, CBLAS_TEST_COMPLEX a, int lda, CBLAS_TEST_COMPLEX x,
	359	- int *incx) {
	360	+void F77_ctrmv(CBLAS_INT layout, char uplow, char transp, char diagn,
	361	+ CBLAS_INT n, CBLAS_TEST_COMPLEX a, CBLAS_INT lda, CBLAS_TEST_COMPLEX x,
	362	+ CBLAS_INT *incx) {
	363	CBLAS_TEST_COMPLEX *A;
	364	- int i,j,LDA;
	365	+ CBLAS_INT i,j,LDA;
	366	CBLAS_TRANSPOSE trans;
	367	CBLAS_UPLO uplo;
	368	CBLAS_DIAG diag;
	369	@@ -558,11 +558,11 @@ void F77_ctrmv(int layout, char uplow,
	370	else
	371	cblas_ctrmv(UNDEFINED, uplo, trans, diag, n, a, lda, x, *incx);
	372	}
	373	-void F77_ctrsv(int layout, char uplow, char transp, char diagn,
	374	- int n, CBLAS_TEST_COMPLEX a, int lda, CBLAS_TEST_COMPLEX x,
	375	- int *incx) {
	376	+void F77_ctrsv(CBLAS_INT layout, char uplow, char transp, char diagn,
	377	+ CBLAS_INT n, CBLAS_TEST_COMPLEX a, CBLAS_INT lda, CBLAS_TEST_COMPLEX x,
	378	+ CBLAS_INT *incx) {
	379	CBLAS_TEST_COMPLEX *A;
	380	- int i,j,LDA;
	381	+ CBLAS_INT i,j,LDA;
	382	CBLAS_TRANSPOSE trans;
	383	CBLAS_UPLO uplo;
	384	CBLAS_DIAG diag;
	385	@@ -588,10 +588,10 @@ void F77_ctrsv(int layout, char uplow,
	386	cblas_ctrsv(UNDEFINED, uplo, trans, diag, n, a, lda, x, *incx );
	387	}
	388
	389	-void F77_chpr(int layout, char uplow, int n, float alpha,
	390	- CBLAS_TEST_COMPLEX x, int incx, CBLAS_TEST_COMPLEX *ap) {
	391	+void F77_chpr(CBLAS_INT layout, char uplow, CBLAS_INT n, float alpha,
	392	+ CBLAS_TEST_COMPLEX x, CBLAS_INT incx, CBLAS_TEST_COMPLEX *ap) {
	393	CBLAS_TEST_COMPLEX A, AP;
	394	- int i,j,k,LDA;
	395	+ CBLAS_INT i,j,k,LDA;
	396	CBLAS_UPLO uplo;
	397
	398	get_uplo_type(uplow,&uplo);
	399	@@ -663,11 +663,11 @@ void F77_chpr(int layout, char uplow,
	400	cblas_chpr(UNDEFINED, uplo, n, alpha, x, *incx, ap );
	401	}
	402
	403	-void F77_chpr2(int layout, char uplow, int n, CBLAS_TEST_COMPLEX alpha,
	404	- CBLAS_TEST_COMPLEX x, int incx, CBLAS_TEST_COMPLEX y, int incy,
	405	+void F77_chpr2(CBLAS_INT layout, char uplow, CBLAS_INT n, CBLAS_TEST_COMPLEX alpha,
	406	+ CBLAS_TEST_COMPLEX x, CBLAS_INT incx, CBLAS_TEST_COMPLEX y, CBLAS_INT incy,
	407	CBLAS_TEST_COMPLEX *ap) {
	408	CBLAS_TEST_COMPLEX A, AP;
	409	- int i,j,k,LDA;
	410	+ CBLAS_INT i,j,k,LDA;
	411	CBLAS_UPLO uplo;
	412
	413	get_uplo_type(uplow,&uplo);
	414	@@ -740,10 +740,10 @@ void F77_chpr2(int layout, char uplow,
	415	cblas_chpr2( UNDEFINED, uplo, n, alpha, x, incx, y, *incy, ap );
	416	}
	417
	418	-void F77_cher(int layout, char uplow, int n, float alpha,
	419	- CBLAS_TEST_COMPLEX x, int incx, CBLAS_TEST_COMPLEX a, int lda) {
	420	+void F77_cher(CBLAS_INT layout, char uplow, CBLAS_INT n, float alpha,
	421	+ CBLAS_TEST_COMPLEX x, CBLAS_INT incx, CBLAS_TEST_COMPLEX a, CBLAS_INT lda) {
	422	CBLAS_TEST_COMPLEX *A;
	423	- int i,j,LDA;
	424	+ CBLAS_INT i,j,LDA;
	425	CBLAS_UPLO uplo;
	426
	427	get_uplo_type(uplow,&uplo);
	428	@@ -772,12 +772,12 @@ void F77_cher(int layout, char uplow,
	429	cblas_cher( UNDEFINED, uplo, n, alpha, x, incx, a, lda );
	430	}
	431
	432	-void F77_cher2(int layout, char uplow, int n, CBLAS_TEST_COMPLEX alpha,
	433	- CBLAS_TEST_COMPLEX x, int incx, CBLAS_TEST_COMPLEX y, int incy,
	434	- CBLAS_TEST_COMPLEX a, int lda) {
	435	+void F77_cher2(CBLAS_INT layout, char uplow, CBLAS_INT n, CBLAS_TEST_COMPLEX alpha,
	436	+ CBLAS_TEST_COMPLEX x, CBLAS_INT incx, CBLAS_TEST_COMPLEX y, CBLAS_INT incy,
	437	+ CBLAS_TEST_COMPLEX a, CBLAS_INT lda) {
	438
	439	CBLAS_TEST_COMPLEX *A;
	440	- int i,j,LDA;
	441	+ CBLAS_INT i,j,LDA;
	442	CBLAS_UPLO uplo;
	443
	444	get_uplo_type(uplow,&uplo);
	445	--- a/CBLAS/testing/c_cblas3.c
	446	+++ b/CBLAS/testing/c_cblas3.c
	447	@@ -11,13 +11,13 @@
	448	#define TEST_ROW_MJR 1
	449	#define UNDEFINED -1
	450
	451	-void F77_cgemm(int layout, char transpa, char transpb, int m, int *n,
	452	- int k, CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a, int lda,
	453	- CBLAS_TEST_COMPLEX b, int ldb, CBLAS_TEST_COMPLEX *beta,
	454	- CBLAS_TEST_COMPLEX c, int ldc ) {
	455	+void F77_cgemm(CBLAS_INT layout, char transpa, char transpb, CBLAS_INT m, CBLAS_INT *n,
	456	+ CBLAS_INT k, CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a, CBLAS_INT lda,
	457	+ CBLAS_TEST_COMPLEX b, CBLAS_INT ldb, CBLAS_TEST_COMPLEX *beta,
	458	+ CBLAS_TEST_COMPLEX c, CBLAS_INT ldc ) {
	459
	460	CBLAS_TEST_COMPLEX A, B, *C;
	461	- int i,j,LDA, LDB, LDC;
	462	+ CBLAS_INT i,j,LDA, LDB, LDC;
	463	CBLAS_TRANSPOSE transa, transb;
	464
	465	get_transpose_type(transpa, &transa);
	466	@@ -87,13 +87,13 @@ void F77_cgemm(int layout, char transp
	467	cblas_cgemm( UNDEFINED, transa, transb, m, n, k, alpha, a, lda,
	468	b, ldb, beta, c, ldc );
	469	}
	470	-void F77_chemm(int layout, char rtlf, char uplow, int m, int *n,
	471	- CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a, int *lda,
	472	- CBLAS_TEST_COMPLEX b, int ldb, CBLAS_TEST_COMPLEX *beta,
	473	- CBLAS_TEST_COMPLEX c, int ldc ) {
	474	+void F77_chemm(CBLAS_INT layout, char rtlf, char uplow, CBLAS_INT m, CBLAS_INT *n,
	475	+ CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a, CBLAS_INT *lda,
	476	+ CBLAS_TEST_COMPLEX b, CBLAS_INT ldb, CBLAS_TEST_COMPLEX *beta,
	477	+ CBLAS_TEST_COMPLEX c, CBLAS_INT ldc ) {
	478
	479	CBLAS_TEST_COMPLEX A, B, *C;
	480	- int i,j,LDA, LDB, LDC;
	481	+ CBLAS_INT i,j,LDA, LDB, LDC;
	482	CBLAS_UPLO uplo;
	483	CBLAS_SIDE side;
	484
	485	@@ -151,13 +151,13 @@ void F77_chemm(int layout, char rtlf,
	486	cblas_chemm( UNDEFINED, side, uplo, m, n, alpha, a, lda, b, ldb,
	487	beta, c, *ldc );
	488	}
	489	-void F77_csymm(int layout, char rtlf, char uplow, int m, int *n,
	490	- CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a, int *lda,
	491	- CBLAS_TEST_COMPLEX b, int ldb, CBLAS_TEST_COMPLEX *beta,
	492	- CBLAS_TEST_COMPLEX c, int ldc ) {
	493	+void F77_csymm(CBLAS_INT layout, char rtlf, char uplow, CBLAS_INT m, CBLAS_INT *n,
	494	+ CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a, CBLAS_INT *lda,
	495	+ CBLAS_TEST_COMPLEX b, CBLAS_INT ldb, CBLAS_TEST_COMPLEX *beta,
	496	+ CBLAS_TEST_COMPLEX c, CBLAS_INT ldc ) {
	497
	498	CBLAS_TEST_COMPLEX A, B, *C;
	499	- int i,j,LDA, LDB, LDC;
	500	+ CBLAS_INT i,j,LDA, LDB, LDC;
	501	CBLAS_UPLO uplo;
	502	CBLAS_SIDE side;
	503
	504	@@ -206,11 +206,11 @@ void F77_csymm(int layout, char rtlf,
	505	beta, c, *ldc );
	506	}
	507
	508	-void F77_cherk(int layout, char uplow, char transp, int n, int *k,
	509	- float alpha, CBLAS_TEST_COMPLEX a, int *lda,
	510	- float beta, CBLAS_TEST_COMPLEX c, int *ldc ) {
	511	+void F77_cherk(CBLAS_INT layout, char uplow, char transp, CBLAS_INT n, CBLAS_INT *k,
	512	+ float alpha, CBLAS_TEST_COMPLEX a, CBLAS_INT *lda,
	513	+ float beta, CBLAS_TEST_COMPLEX c, CBLAS_INT *ldc ) {
	514
	515	- int i,j,LDA,LDC;
	516	+ CBLAS_INT i,j,LDA,LDC;
	517	CBLAS_TEST_COMPLEX A, C;
	518	CBLAS_UPLO uplo;
	519	CBLAS_TRANSPOSE trans;
	520	@@ -262,11 +262,11 @@ void F77_cherk(int layout, char uplow,
	521	c, *ldc );
	522	}
	523
	524	-void F77_csyrk(int layout, char uplow, char transp, int n, int *k,
	525	- CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a, int *lda,
	526	- CBLAS_TEST_COMPLEX beta, CBLAS_TEST_COMPLEX c, int *ldc ) {
	527	+void F77_csyrk(CBLAS_INT layout, char uplow, char transp, CBLAS_INT n, CBLAS_INT *k,
	528	+ CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a, CBLAS_INT *lda,
	529	+ CBLAS_TEST_COMPLEX beta, CBLAS_TEST_COMPLEX c, CBLAS_INT *ldc ) {
	530
	531	- int i,j,LDA,LDC;
	532	+ CBLAS_INT i,j,LDA,LDC;
	533	CBLAS_TEST_COMPLEX A, C;
	534	CBLAS_UPLO uplo;
	535	CBLAS_TRANSPOSE trans;
	536	@@ -317,11 +317,11 @@ void F77_csyrk(int layout, char uplow,
	537	cblas_csyrk(UNDEFINED, uplo, trans, n, k, alpha, a, *lda, beta,
	538	c, *ldc );
	539	}
	540	-void F77_cher2k(int layout, char uplow, char transp, int n, int *k,
	541	- CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a, int *lda,
	542	- CBLAS_TEST_COMPLEX b, int ldb, float *beta,
	543	- CBLAS_TEST_COMPLEX c, int ldc ) {
	544	- int i,j,LDA,LDB,LDC;
	545	+void F77_cher2k(CBLAS_INT layout, char uplow, char transp, CBLAS_INT n, CBLAS_INT *k,
	546	+ CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a, CBLAS_INT *lda,
	547	+ CBLAS_TEST_COMPLEX b, CBLAS_INT ldb, float *beta,
	548	+ CBLAS_TEST_COMPLEX c, CBLAS_INT ldc ) {
	549	+ CBLAS_INT i,j,LDA,LDB,LDC;
	550	CBLAS_TEST_COMPLEX A, B, *C;
	551	CBLAS_UPLO uplo;
	552	CBLAS_TRANSPOSE trans;
	553	@@ -381,11 +381,11 @@ void F77_cher2k(int layout, char uplow
	554	cblas_cher2k(UNDEFINED, uplo, trans, n, k, alpha, a, *lda,
	555	b, ldb, beta, c, *ldc );
	556	}
	557	-void F77_csyr2k(int layout, char uplow, char transp, int n, int *k,
	558	- CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a, int *lda,
	559	- CBLAS_TEST_COMPLEX b, int ldb, CBLAS_TEST_COMPLEX *beta,
	560	- CBLAS_TEST_COMPLEX c, int ldc ) {
	561	- int i,j,LDA,LDB,LDC;
	562	+void F77_csyr2k(CBLAS_INT layout, char uplow, char transp, CBLAS_INT n, CBLAS_INT *k,
	563	+ CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a, CBLAS_INT *lda,
	564	+ CBLAS_TEST_COMPLEX b, CBLAS_INT ldb, CBLAS_TEST_COMPLEX *beta,
	565	+ CBLAS_TEST_COMPLEX c, CBLAS_INT ldc ) {
	566	+ CBLAS_INT i,j,LDA,LDB,LDC;
	567	CBLAS_TEST_COMPLEX A, B, *C;
	568	CBLAS_UPLO uplo;
	569	CBLAS_TRANSPOSE trans;
	570	@@ -445,10 +445,10 @@ void F77_csyr2k(int layout, char uplow
	571	cblas_csyr2k(UNDEFINED, uplo, trans, n, k, alpha, a, *lda,
	572	b, ldb, beta, c, ldc );
	573	}
	574	-void F77_ctrmm(int layout, char rtlf, char uplow, char transp, char *diagn,
	575	- int m, int n, CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a,
	576	- int lda, CBLAS_TEST_COMPLEX b, int *ldb) {
	577	- int i,j,LDA,LDB;
	578	+void F77_ctrmm(CBLAS_INT layout, char rtlf, char uplow, char transp, char *diagn,
	579	+ CBLAS_INT m, CBLAS_INT n, CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a,
	580	+ CBLAS_INT lda, CBLAS_TEST_COMPLEX b, CBLAS_INT *ldb) {
	581	+ CBLAS_INT i,j,LDA,LDB;
	582	CBLAS_TEST_COMPLEX A, B;
	583	CBLAS_SIDE side;
	584	CBLAS_DIAG diag;
	585	@@ -504,10 +504,10 @@ void F77_ctrmm(int layout, char rtlf,
	586	a, lda, b, ldb);
	587	}
	588
	589	-void F77_ctrsm(int layout, char rtlf, char uplow, char transp, char *diagn,
	590	- int m, int n, CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a,
	591	- int lda, CBLAS_TEST_COMPLEX b, int *ldb) {
	592	- int i,j,LDA,LDB;
	593	+void F77_ctrsm(CBLAS_INT layout, char rtlf, char uplow, char transp, char *diagn,
	594	+ CBLAS_INT m, CBLAS_INT n, CBLAS_TEST_COMPLEX alpha, CBLAS_TEST_COMPLEX a,
	595	+ CBLAS_INT lda, CBLAS_TEST_COMPLEX b, CBLAS_INT *ldb) {
	596	+ CBLAS_INT i,j,LDA,LDB;
	597	CBLAS_TEST_COMPLEX A, B;
	598	CBLAS_SIDE side;
	599	CBLAS_DIAG diag;
	600	--- a/CBLAS/testing/c_d2chke.c
	601	+++ b/CBLAS/testing/c_d2chke.c
	602	@@ -3,8 +3,8 @@
	603	#include "cblas.h"
	604	#include "cblas_test.h"
	605
	606	-int cblas_ok, cblas_lerr, cblas_info;
	607	-int link_xerbla=TRUE;
	608	+CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
	609	+CBLAS_INT link_xerbla=TRUE;
	610	char *cblas_rout;
	611
	612	#ifdef F77_Char
	613	@@ -14,8 +14,8 @@ void F77_xerbla(char srname, void vinf
	614	#endif
	615
	616	void chkxer(void) {
	617	- extern int cblas_ok, cblas_lerr, cblas_info;
	618	- extern int link_xerbla;
	619	+ extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
	620	+ extern CBLAS_INT link_xerbla;
	621	extern char *cblas_rout;
	622	if (cblas_lerr == 1 ) {
	623	printf("*** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s ***\n", cblas_info, cblas_rout);
	624	@@ -30,7 +30,7 @@ void F77_d2chke(char *rout) {
	625	X[2] = {0.0,0.0},
	626	Y[2] = {0.0,0.0},
	627	ALPHA=0.0, BETA=0.0;
	628	- extern int cblas_info, cblas_lerr, cblas_ok;
	629	+ extern CBLAS_INT cblas_info, cblas_lerr, cblas_ok;
	630	extern int RowMajorStrg;
	631	extern char *cblas_rout;
	632
	633	--- a/CBLAS/testing/c_d3chke.c
	634	+++ b/CBLAS/testing/c_d3chke.c
	635	@@ -3,8 +3,8 @@
	636	#include "cblas.h"
	637	#include "cblas_test.h"
	638
	639	-int cblas_ok, cblas_lerr, cblas_info;
	640	-int link_xerbla=TRUE;
	641	+CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
	642	+CBLAS_INT link_xerbla=TRUE;
	643	char *cblas_rout;
	644
	645	#ifdef F77_Char
	646	@@ -14,8 +14,8 @@ void F77_xerbla(char srname, void vinf
	647	#endif
	648
	649	void chkxer(void) {
	650	- extern int cblas_ok, cblas_lerr, cblas_info;
	651	- extern int link_xerbla;
	652	+ extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
	653	+ extern CBLAS_INT link_xerbla;
	654	extern char *cblas_rout;
	655	if (cblas_lerr == 1 ) {
	656	printf("*** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s ***\n", cblas_info, cblas_rout);
	657	@@ -30,7 +30,7 @@ void F77_d3chke(char *rout) {
	658	B[2] = {0.0,0.0},
	659	C[2] = {0.0,0.0},
	660	ALPHA=0.0, BETA=0.0;
	661	- extern int cblas_info, cblas_lerr, cblas_ok;
	662	+ extern CBLAS_INT cblas_info, cblas_lerr, cblas_ok;
	663	extern int RowMajorStrg;
	664	extern char *cblas_rout;
	665
	666	--- a/CBLAS/testing/c_dblas1.c
	667	+++ b/CBLAS/testing/c_dblas1.c
	668	@@ -8,32 +8,32 @@
	669	*/
	670	#include "cblas_test.h"
	671	#include "cblas.h"
	672	-double F77_dasum(const int N, double X, const int *incX)
	673	+double F77_dasum(const CBLAS_INT N, double X, const CBLAS_INT *incX)
	674	{
	675	return cblas_dasum(N, X, incX);
	676	}
	677
	678	-void F77_daxpy(const int N, const double alpha, const double *X,
	679	- const int incX, double Y, const int *incY)
	680	+void F77_daxpy(const CBLAS_INT N, const double alpha, const double *X,
	681	+ const CBLAS_INT incX, double Y, const CBLAS_INT *incY)
	682	{
	683	cblas_daxpy(N, alpha, X, incX, Y, incY);
	684	return;
	685	}
	686
	687	-void F77_dcopy(const int N, double X, const int *incX,
	688	- double Y, const int incY)
	689	+void F77_dcopy(const CBLAS_INT N, double X, const CBLAS_INT *incX,
	690	+ double Y, const CBLAS_INT incY)
	691	{
	692	cblas_dcopy(N, X, incX, Y, *incY);
	693	return;
	694	}
	695
	696	-double F77_ddot(const int N, const double X, const int *incX,
	697	- const double Y, const int incY)
	698	+double F77_ddot(const CBLAS_INT N, const double X, const CBLAS_INT *incX,
	699	+ const double Y, const CBLAS_INT incY)
	700	{
	701	return cblas_ddot(N, X, incX, Y, *incY);
	702	}
	703
	704	-double F77_dnrm2(const int N, const double X, const int *incX)
	705	+double F77_dnrm2(const CBLAS_INT N, const double X, const CBLAS_INT *incX)
	706	{
	707	return cblas_dnrm2(N, X, incX);
	708	}
	709	@@ -44,39 +44,39 @@ void F77_drotg( double a, double b, do
	710	return;
	711	}
	712
	713	-void F77_drot( const int N, double X, const int incX, double Y,
	714	- const int incY, const double c, const double *s)
	715	+void F77_drot( const CBLAS_INT N, double X, const CBLAS_INT incX, double Y,
	716	+ const CBLAS_INT incY, const double c, const double *s)
	717	{
	718
	719	cblas_drot(N,X,incX,Y,incY,c,*s);
	720	return;
	721	}
	722
	723	-void F77_dscal(const int N, const double alpha, double *X,
	724	- const int *incX)
	725	+void F77_dscal(const CBLAS_INT N, const double alpha, double *X,
	726	+ const CBLAS_INT *incX)
	727	{
	728	cblas_dscal(N, alpha, X, *incX);
	729	return;
	730	}
	731
	732	-void F77_dswap( const int N, double X, const int *incX,
	733	- double Y, const int incY)
	734	+void F77_dswap( const CBLAS_INT N, double X, const CBLAS_INT *incX,
	735	+ double Y, const CBLAS_INT incY)
	736	{
	737	cblas_dswap(N,X,incX,Y,*incY);
	738	return;
	739	}
	740
	741	-double F77_dzasum(const int N, void X, const int *incX)
	742	+double F77_dzasum(const CBLAS_INT N, void X, const CBLAS_INT *incX)
	743	{
	744	return cblas_dzasum(N, X, incX);
	745	}
	746
	747	-double F77_dznrm2(const int N, const void X, const int *incX)
	748	+double F77_dznrm2(const CBLAS_INT N, const void X, const CBLAS_INT *incX)
	749	{
	750	return cblas_dznrm2(N, X, incX);
	751	}
	752
	753	-int F77_idamax(const int N, const double X, const int *incX)
	754	+CBLAS_INT F77_idamax(const CBLAS_INT N, const double X, const CBLAS_INT *incX)
	755	{
	756	if (N < 1 \|\| incX < 1) return(0);
	757	return (cblas_idamax(N, X, incX)+1);
	758	--- a/CBLAS/testing/c_dblas2.c
	759	+++ b/CBLAS/testing/c_dblas2.c
	760	@@ -8,12 +8,12 @@
	761	#include "cblas.h"
	762	#include "cblas_test.h"
	763
	764	-void F77_dgemv(int layout, char transp, int m, int n, double *alpha,
	765	- double a, int lda, double x, int incx, double *beta,
	766	- double y, int incy ) {
	767	+void F77_dgemv(CBLAS_INT layout, char transp, CBLAS_INT m, CBLAS_INT n, double *alpha,
	768	+ double a, CBLAS_INT lda, double x, CBLAS_INT incx, double *beta,
	769	+ double y, CBLAS_INT incy ) {
	770
	771	double *A;
	772	- int i,j,LDA;
	773	+ CBLAS_INT i,j,LDA;
	774	CBLAS_TRANSPOSE trans;
	775
	776	get_transpose_type(transp, &trans);
	777	@@ -35,11 +35,11 @@ void F77_dgemv(int layout, char transp
	778	m, n, alpha, a, lda, x, incx, beta, y, *incy );
	779	}
	780
	781	-void F77_dger(int layout, int m, int n, double alpha, double x, int incx,
	782	- double y, int incy, double a, int lda ) {
	783	+void F77_dger(CBLAS_INT layout, CBLAS_INT m, CBLAS_INT n, double alpha, double x, CBLAS_INT incx,
	784	+ double y, CBLAS_INT incy, double a, CBLAS_INT lda ) {
	785
	786	double *A;
	787	- int i,j,LDA;
	788	+ CBLAS_INT i,j,LDA;
	789
	790	if (*layout == TEST_ROW_MJR) {
	791	LDA = *n+1;
	792	@@ -60,10 +60,10 @@ void F77_dger(int layout, int m, int *
	793	cblas_dger( CblasColMajor, m, n, alpha, x, incx, y, incy, a, lda );
	794	}
	795
	796	-void F77_dtrmv(int layout, char uplow, char transp, char diagn,
	797	- int n, double a, int lda, double x, int *incx) {
	798	+void F77_dtrmv(CBLAS_INT layout, char uplow, char transp, char diagn,
	799	+ CBLAS_INT n, double a, CBLAS_INT lda, double x, CBLAS_INT *incx) {
	800	double *A;
	801	- int i,j,LDA;
	802	+ CBLAS_INT i,j,LDA;
	803	CBLAS_TRANSPOSE trans;
	804	CBLAS_UPLO uplo;
	805	CBLAS_DIAG diag;
	806	@@ -88,10 +88,10 @@ void F77_dtrmv(int layout, char uplow,
	807	}
	808	}
	809
	810	-void F77_dtrsv(int layout, char uplow, char transp, char diagn,
	811	- int n, double a, int lda, double x, int *incx ) {
	812	+void F77_dtrsv(CBLAS_INT layout, char uplow, char transp, char diagn,
	813	+ CBLAS_INT n, double a, CBLAS_INT lda, double x, CBLAS_INT *incx ) {
	814	double *A;
	815	- int i,j,LDA;
	816	+ CBLAS_INT i,j,LDA;
	817	CBLAS_TRANSPOSE trans;
	818	CBLAS_UPLO uplo;
	819	CBLAS_DIAG diag;
	820	@@ -112,11 +112,11 @@ void F77_dtrsv(int layout, char uplow,
	821	else
	822	cblas_dtrsv(CblasColMajor, uplo, trans, diag, n, a, lda, x, *incx );
	823	}
	824	-void F77_dsymv(int layout, char uplow, int n, double alpha, double *a,
	825	- int lda, double x, int incx, double beta, double *y,
	826	- int *incy) {
	827	+void F77_dsymv(CBLAS_INT layout, char uplow, CBLAS_INT n, double alpha, double *a,
	828	+ CBLAS_INT lda, double x, CBLAS_INT incx, double beta, double *y,
	829	+ CBLAS_INT *incy) {
	830	double *A;
	831	- int i,j,LDA;
	832	+ CBLAS_INT i,j,LDA;
	833	CBLAS_UPLO uplo;
	834
	835	get_uplo_type(uplow,&uplo);
	836	@@ -136,10 +136,10 @@ void F77_dsymv(int layout, char uplow,
	837	beta, y, incy );
	838	}
	839
	840	-void F77_dsyr(int layout, char uplow, int n, double alpha, double *x,
	841	- int incx, double a, int *lda) {
	842	+void F77_dsyr(CBLAS_INT layout, char uplow, CBLAS_INT n, double alpha, double *x,
	843	+ CBLAS_INT incx, double a, CBLAS_INT *lda) {
	844	double *A;
	845	- int i,j,LDA;
	846	+ CBLAS_INT i,j,LDA;
	847	CBLAS_UPLO uplo;
	848
	849	get_uplo_type(uplow,&uplo);
	850	@@ -160,10 +160,10 @@ void F77_dsyr(int layout, char uplow,
	851	cblas_dsyr(CblasColMajor, uplo, n, alpha, x, incx, a, lda);
	852	}
	853
	854	-void F77_dsyr2(int layout, char uplow, int n, double alpha, double *x,
	855	- int incx, double y, int incy, double a, int *lda) {
	856	+void F77_dsyr2(CBLAS_INT layout, char uplow, CBLAS_INT n, double alpha, double *x,
	857	+ CBLAS_INT incx, double y, CBLAS_INT incy, double a, CBLAS_INT *lda) {
	858	double *A;
	859	- int i,j,LDA;
	860	+ CBLAS_INT i,j,LDA;
	861	CBLAS_UPLO uplo;
	862
	863	get_uplo_type(uplow,&uplo);
	864	@@ -184,12 +184,12 @@ void F77_dsyr2(int layout, char uplow,
	865	cblas_dsyr2(CblasColMajor, uplo, n, alpha, x, incx, y, incy, a, *lda);
	866	}
	867
	868	-void F77_dgbmv(int layout, char transp, int m, int n, int kl, int ku,
	869	- double alpha, double a, int lda, double x, int *incx,
	870	- double beta, double y, int *incy ) {
	871	+void F77_dgbmv(CBLAS_INT layout, char transp, CBLAS_INT m, CBLAS_INT n, CBLAS_INT kl, CBLAS_INT ku,
	872	+ double alpha, double a, CBLAS_INT lda, double x, CBLAS_INT *incx,
	873	+ double beta, double y, CBLAS_INT *incy ) {
	874
	875	double *A;
	876	- int i,irow,j,jcol,LDA;
	877	+ CBLAS_INT i,irow,j,jcol,LDA;
	878	CBLAS_TRANSPOSE trans;
	879
	880	get_transpose_type(transp, &trans);
	881	@@ -222,10 +222,10 @@ void F77_dgbmv(int layout, char transp
	882	a, lda, x, incx, beta, y, incy );
	883	}
	884
	885	-void F77_dtbmv(int layout, char uplow, char transp, char diagn,
	886	- int n, int k, double a, int lda, double x, int incx) {
	887	+void F77_dtbmv(CBLAS_INT layout, char uplow, char transp, char diagn,
	888	+ CBLAS_INT n, CBLAS_INT k, double a, CBLAS_INT lda, double x, CBLAS_INT incx) {
	889	double *A;
	890	- int irow, jcol, i, j, LDA;
	891	+ CBLAS_INT irow, jcol, i, j, LDA;
	892	CBLAS_TRANSPOSE trans;
	893	CBLAS_UPLO uplo;
	894	CBLAS_DIAG diag;
	895	@@ -268,10 +268,10 @@ void F77_dtbmv(int layout, char uplow,
	896	cblas_dtbmv(CblasColMajor, uplo, trans, diag, n, k, a, lda, x, incx);
	897	}
	898
	899	-void F77_dtbsv(int layout, char uplow, char transp, char diagn,
	900	- int n, int k, double a, int lda, double x, int incx) {
	901	+void F77_dtbsv(CBLAS_INT layout, char uplow, char transp, char diagn,
	902	+ CBLAS_INT n, CBLAS_INT k, double a, CBLAS_INT lda, double x, CBLAS_INT incx) {
	903	double *A;
	904	- int irow, jcol, i, j, LDA;
	905	+ CBLAS_INT irow, jcol, i, j, LDA;
	906	CBLAS_TRANSPOSE trans;
	907	CBLAS_UPLO uplo;
	908	CBLAS_DIAG diag;
	909	@@ -314,11 +314,11 @@ void F77_dtbsv(int layout, char uplow,
	910	cblas_dtbsv(CblasColMajor, uplo, trans, diag, n, k, a, lda, x, incx);
	911	}
	912
	913	-void F77_dsbmv(int layout, char uplow, int n, int k, double *alpha,
	914	- double a, int lda, double x, int incx, double *beta,
	915	- double y, int incy) {
	916	+void F77_dsbmv(CBLAS_INT layout, char uplow, CBLAS_INT n, CBLAS_INT k, double *alpha,
	917	+ double a, CBLAS_INT lda, double x, CBLAS_INT incx, double *beta,
	918	+ double y, CBLAS_INT incy) {
	919	double *A;
	920	- int i,j,irow,jcol,LDA;
	921	+ CBLAS_INT i,j,irow,jcol,LDA;
	922	CBLAS_UPLO uplo;
	923
	924	get_uplo_type(uplow,&uplo);
	925	@@ -359,10 +359,10 @@ void F77_dsbmv(int layout, char uplow,
	926	beta, y, incy );
	927	}
	928
	929	-void F77_dspmv(int layout, char uplow, int n, double alpha, double *ap,
	930	- double x, int incx, double beta, double y, int *incy) {
	931	+void F77_dspmv(CBLAS_INT layout, char uplow, CBLAS_INT n, double alpha, double *ap,
	932	+ double x, CBLAS_INT incx, double beta, double y, CBLAS_INT *incy) {
	933	double A,AP;
	934	- int i,j,k,LDA;
	935	+ CBLAS_INT i,j,k,LDA;
	936	CBLAS_UPLO uplo;
	937
	938	get_uplo_type(uplow,&uplo);
	939	@@ -397,10 +397,10 @@ void F77_dspmv(int layout, char uplow,
	940	*incy );
	941	}
	942
	943	-void F77_dtpmv(int layout, char uplow, char transp, char diagn,
	944	- int n, double ap, double x, int incx) {
	945	+void F77_dtpmv(CBLAS_INT layout, char uplow, char transp, char diagn,
	946	+ CBLAS_INT n, double ap, double x, CBLAS_INT incx) {
	947	double A, AP;
	948	- int i, j, k, LDA;
	949	+ CBLAS_INT i, j, k, LDA;
	950	CBLAS_TRANSPOSE trans;
	951	CBLAS_UPLO uplo;
	952	CBLAS_DIAG diag;
	953	@@ -437,10 +437,10 @@ void F77_dtpmv(int layout, char uplow,
	954	cblas_dtpmv( CblasColMajor, uplo, trans, diag, n, ap, x, incx );
	955	}
	956
	957	-void F77_dtpsv(int layout, char uplow, char transp, char diagn,
	958	- int n, double ap, double x, int incx) {
	959	+void F77_dtpsv(CBLAS_INT layout, char uplow, char transp, char diagn,
	960	+ CBLAS_INT n, double ap, double x, CBLAS_INT incx) {
	961	double A, AP;
	962	- int i, j, k, LDA;
	963	+ CBLAS_INT i, j, k, LDA;
	964	CBLAS_TRANSPOSE trans;
	965	CBLAS_UPLO uplo;
	966	CBLAS_DIAG diag;
	967	@@ -478,10 +478,10 @@ void F77_dtpsv(int layout, char uplow,
	968	cblas_dtpsv( CblasColMajor, uplo, trans, diag, n, ap, x, incx );
	969	}
	970
	971	-void F77_dspr(int layout, char uplow, int n, double alpha, double *x,
	972	- int incx, double ap ){
	973	+void F77_dspr(CBLAS_INT layout, char uplow, CBLAS_INT n, double alpha, double *x,
	974	+ CBLAS_INT incx, double ap ){
	975	double A, AP;
	976	- int i,j,k,LDA;
	977	+ CBLAS_INT i,j,k,LDA;
	978	CBLAS_UPLO uplo;
	979
	980	get_uplo_type(uplow,&uplo);
	981	@@ -530,10 +530,10 @@ void F77_dspr(int layout, char uplow,
	982	cblas_dspr( CblasColMajor, uplo, n, alpha, x, *incx, ap );
	983	}
	984
	985	-void F77_dspr2(int layout, char uplow, int n, double alpha, double *x,
	986	- int incx, double y, int incy, double ap ){
	987	+void F77_dspr2(CBLAS_INT layout, char uplow, CBLAS_INT n, double alpha, double *x,
	988	+ CBLAS_INT incx, double y, CBLAS_INT incy, double ap ){
	989	double A, AP;
	990	- int i,j,k,LDA;
	991	+ CBLAS_INT i,j,k,LDA;
	992	CBLAS_UPLO uplo;
	993
	994	get_uplo_type(uplow,&uplo);
	995	--- a/CBLAS/testing/c_dblas3.c
	996	+++ b/CBLAS/testing/c_dblas3.c
	997	@@ -11,12 +11,12 @@
	998	#define TEST_ROW_MJR 1
	999	#define UNDEFINED -1
	1000
	1001	-void F77_dgemm(int layout, char transpa, char transpb, int m, int *n,
	1002	- int k, double alpha, double a, int lda, double b, int ldb,
	1003	- double beta, double c, int *ldc ) {
	1004	+void F77_dgemm(CBLAS_INT layout, char transpa, char transpb, CBLAS_INT m, CBLAS_INT *n,
	1005	+ CBLAS_INT k, double alpha, double a, CBLAS_INT lda, double b, CBLAS_INT ldb,
	1006	+ double beta, double c, CBLAS_INT *ldc ) {
	1007
	1008	double A, B, *C;
	1009	- int i,j,LDA, LDB, LDC;
	1010	+ CBLAS_INT i,j,LDA, LDB, LDC;
	1011	CBLAS_TRANSPOSE transa, transb;
	1012
	1013	get_transpose_type(transpa, &transa);
	1014	@@ -73,12 +73,12 @@ void F77_dgemm(int layout, char transp
	1015	cblas_dgemm( UNDEFINED, transa, transb, m, n, k, alpha, a, *lda,
	1016	b, ldb, beta, c, *ldc );
	1017	}
	1018	-void F77_dsymm(int layout, char rtlf, char uplow, int m, int *n,
	1019	- double alpha, double a, int lda, double b, int *ldb,
	1020	- double beta, double c, int *ldc ) {
	1021	+void F77_dsymm(CBLAS_INT layout, char rtlf, char uplow, CBLAS_INT m, CBLAS_INT *n,
	1022	+ double alpha, double a, CBLAS_INT lda, double b, CBLAS_INT *ldb,
	1023	+ double beta, double c, CBLAS_INT *ldc ) {
	1024
	1025	double A, B, *C;
	1026	- int i,j,LDA, LDB, LDC;
	1027	+ CBLAS_INT i,j,LDA, LDB, LDC;
	1028	CBLAS_UPLO uplo;
	1029	CBLAS_SIDE side;
	1030
	1031	@@ -127,11 +127,11 @@ void F77_dsymm(int layout, char rtlf,
	1032	beta, c, ldc );
	1033	}
	1034
	1035	-void F77_dsyrk(int layout, char uplow, char transp, int n, int *k,
	1036	- double alpha, double a, int *lda,
	1037	- double beta, double c, int *ldc ) {
	1038	+void F77_dsyrk(CBLAS_INT layout, char uplow, char transp, CBLAS_INT n, CBLAS_INT *k,
	1039	+ double alpha, double a, CBLAS_INT *lda,
	1040	+ double beta, double c, CBLAS_INT *ldc ) {
	1041
	1042	- int i,j,LDA,LDC;
	1043	+ CBLAS_INT i,j,LDA,LDC;
	1044	double A, C;
	1045	CBLAS_UPLO uplo;
	1046	CBLAS_TRANSPOSE trans;
	1047	@@ -175,10 +175,10 @@ void F77_dsyrk(int layout, char uplow,
	1048	c, *ldc );
	1049	}
	1050
	1051	-void F77_dsyr2k(int layout, char uplow, char transp, int n, int *k,
	1052	- double alpha, double a, int lda, double b, int *ldb,
	1053	- double beta, double c, int *ldc ) {
	1054	- int i,j,LDA,LDB,LDC;
	1055	+void F77_dsyr2k(CBLAS_INT layout, char uplow, char transp, CBLAS_INT n, CBLAS_INT *k,
	1056	+ double alpha, double a, CBLAS_INT lda, double b, CBLAS_INT *ldb,
	1057	+ double beta, double c, CBLAS_INT *ldc ) {
	1058	+ CBLAS_INT i,j,LDA,LDB,LDC;
	1059	double A, B, *C;
	1060	CBLAS_UPLO uplo;
	1061	CBLAS_TRANSPOSE trans;
	1062	@@ -230,10 +230,10 @@ void F77_dsyr2k(int layout, char uplow
	1063	cblas_dsyr2k(UNDEFINED, uplo, trans, n, k, alpha, a, lda,
	1064	b, ldb, beta, c, *ldc );
	1065	}
	1066	-void F77_dtrmm(int layout, char rtlf, char uplow, char transp, char *diagn,
	1067	- int m, int n, double alpha, double a, int lda, double b,
	1068	- int *ldb) {
	1069	- int i,j,LDA,LDB;
	1070	+void F77_dtrmm(CBLAS_INT layout, char rtlf, char uplow, char transp, char *diagn,
	1071	+ CBLAS_INT m, CBLAS_INT n, double alpha, double a, CBLAS_INT lda, double b,
	1072	+ CBLAS_INT *ldb) {
	1073	+ CBLAS_INT i,j,LDA,LDB;
	1074	double A, B;
	1075	CBLAS_SIDE side;
	1076	CBLAS_DIAG diag;
	1077	@@ -281,10 +281,10 @@ void F77_dtrmm(int layout, char rtlf,
	1078	a, lda, b, ldb);
	1079	}
	1080
	1081	-void F77_dtrsm(int layout, char rtlf, char uplow, char transp, char *diagn,
	1082	- int m, int n, double alpha, double a, int lda, double b,
	1083	- int *ldb) {
	1084	- int i,j,LDA,LDB;
	1085	+void F77_dtrsm(CBLAS_INT layout, char rtlf, char uplow, char transp, char *diagn,
	1086	+ CBLAS_INT m, CBLAS_INT n, double alpha, double a, CBLAS_INT lda, double b,
	1087	+ CBLAS_INT *ldb) {
	1088	+ CBLAS_INT i,j,LDA,LDB;
	1089	double A, B;
	1090	CBLAS_SIDE side;
	1091	CBLAS_DIAG diag;
	1092	--- a/CBLAS/testing/c_s2chke.c
	1093	+++ b/CBLAS/testing/c_s2chke.c
	1094	@@ -3,8 +3,8 @@
	1095	#include "cblas.h"
	1096	#include "cblas_test.h"
	1097
	1098	-int cblas_ok, cblas_lerr, cblas_info;
	1099	-int link_xerbla=TRUE;
	1100	+CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
	1101	+CBLAS_INT link_xerbla=TRUE;
	1102	char *cblas_rout;
	1103
	1104	#ifdef F77_Char
	1105	@@ -14,8 +14,8 @@ void F77_xerbla(char srname, void vinf
	1106	#endif
	1107
	1108	void chkxer(void) {
	1109	- extern int cblas_ok, cblas_lerr, cblas_info;
	1110	- extern int link_xerbla;
	1111	+ extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
	1112	+ extern CBLAS_INT link_xerbla;
	1113	extern char *cblas_rout;
	1114	if (cblas_lerr == 1 ) {
	1115	printf("*** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s ***\n", cblas_info, cblas_rout);
	1116	@@ -30,7 +30,7 @@ void F77_s2chke(char *rout) {
	1117	X[2] = {0.0,0.0},
	1118	Y[2] = {0.0,0.0},
	1119	ALPHA=0.0, BETA=0.0;
	1120	- extern int cblas_info, cblas_lerr, cblas_ok;
	1121	+ extern CBLAS_INT cblas_info, cblas_lerr, cblas_ok;
	1122	extern int RowMajorStrg;
	1123	extern char *cblas_rout;
	1124
	1125	--- a/CBLAS/testing/c_s3chke.c
	1126	+++ b/CBLAS/testing/c_s3chke.c
	1127	@@ -3,8 +3,8 @@
	1128	#include "cblas.h"
	1129	#include "cblas_test.h"
	1130
	1131	-int cblas_ok, cblas_lerr, cblas_info;
	1132	-int link_xerbla=TRUE;
	1133	+CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
	1134	+CBLAS_INT link_xerbla=TRUE;
	1135	char *cblas_rout;
	1136
	1137	#ifdef F77_Char
	1138	@@ -14,8 +14,8 @@ void F77_xerbla(char srname, void vinf
	1139	#endif
	1140
	1141	void chkxer(void) {
	1142	- extern int cblas_ok, cblas_lerr, cblas_info;
	1143	- extern int link_xerbla;
	1144	+ extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
	1145	+ extern CBLAS_INT link_xerbla;
	1146	extern char *cblas_rout;
	1147	if (cblas_lerr == 1 ) {
	1148	printf("*** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s ***\n", cblas_info, cblas_rout);
	1149	@@ -30,7 +30,7 @@ void F77_s3chke(char *rout) {
	1150	B[2] = {0.0,0.0},
	1151	C[2] = {0.0,0.0},
	1152	ALPHA=0.0, BETA=0.0;
	1153	- extern int cblas_info, cblas_lerr, cblas_ok;
	1154	+ extern CBLAS_INT cblas_info, cblas_lerr, cblas_ok;
	1155	extern int RowMajorStrg;
	1156	extern char *cblas_rout;
	1157
	1158	--- a/CBLAS/testing/c_sblas1.c
	1159	+++ b/CBLAS/testing/c_sblas1.c
	1160	@@ -8,42 +8,42 @@
	1161	*/
	1162	#include "cblas_test.h"
	1163	#include "cblas.h"
	1164	-float F77_sasum(const int N, float X, const int *incX)
	1165	+float F77_sasum(const CBLAS_INT N, float X, const CBLAS_INT *incX)
	1166	{
	1167	return cblas_sasum(N, X, incX);
	1168	}
	1169
	1170	-void F77_saxpy(const int N, const float alpha, const float *X,
	1171	- const int incX, float Y, const int *incY)
	1172	+void F77_saxpy(const CBLAS_INT N, const float alpha, const float *X,
	1173	+ const CBLAS_INT incX, float Y, const CBLAS_INT *incY)
	1174	{
	1175	cblas_saxpy(N, alpha, X, incX, Y, incY);
	1176	return;
	1177	}
	1178
	1179	-float F77_scasum(const int N, void X, const int *incX)
	1180	+float F77_scasum(const CBLAS_INT N, void X, const CBLAS_INT *incX)
	1181	{
	1182	return cblas_scasum(N, X, incX);
	1183	}
	1184
	1185	-float F77_scnrm2(const int N, const void X, const int *incX)
	1186	+float F77_scnrm2(const CBLAS_INT N, const void X, const CBLAS_INT *incX)
	1187	{
	1188	return cblas_scnrm2(N, X, incX);
	1189	}
	1190
	1191	-void F77_scopy(const int N, const float X, const int *incX,
	1192	- float Y, const int incY)
	1193	+void F77_scopy(const CBLAS_INT N, const float X, const CBLAS_INT *incX,
	1194	+ float Y, const CBLAS_INT incY)
	1195	{
	1196	cblas_scopy(N, X, incX, Y, *incY);
	1197	return;
	1198	}
	1199
	1200	-float F77_sdot(const int N, const float X, const int *incX,
	1201	- const float Y, const int incY)
	1202	+float F77_sdot(const CBLAS_INT N, const float X, const CBLAS_INT *incX,
	1203	+ const float Y, const CBLAS_INT incY)
	1204	{
	1205	return cblas_sdot(N, X, incX, Y, *incY);
	1206	}
	1207
	1208	-float F77_snrm2(const int N, const float X, const int *incX)
	1209	+float F77_snrm2(const CBLAS_INT N, const float X, const CBLAS_INT *incX)
	1210	{
	1211	return cblas_snrm2(N, X, incX);
	1212	}
	1213	@@ -54,28 +54,28 @@ void F77_srotg( float a, float b, floa
	1214	return;
	1215	}
	1216
	1217	-void F77_srot( const int N, float X, const int incX, float Y,
	1218	- const int incY, const float c, const float *s)
	1219	+void F77_srot( const CBLAS_INT N, float X, const CBLAS_INT incX, float Y,
	1220	+ const CBLAS_INT incY, const float c, const float *s)
	1221	{
	1222	cblas_srot(N,X,incX,Y,incY,c,*s);
	1223	return;
	1224	}
	1225
	1226	-void F77_sscal(const int N, const float alpha, float *X,
	1227	- const int *incX)
	1228	+void F77_sscal(const CBLAS_INT N, const float alpha, float *X,
	1229	+ const CBLAS_INT *incX)
	1230	{
	1231	cblas_sscal(N, alpha, X, *incX);
	1232	return;
	1233	}
	1234
	1235	-void F77_sswap( const int N, float X, const int *incX,
	1236	- float Y, const int incY)
	1237	+void F77_sswap( const CBLAS_INT N, float X, const CBLAS_INT *incX,
	1238	+ float Y, const CBLAS_INT incY)
	1239	{
	1240	cblas_sswap(N,X,incX,Y,*incY);
	1241	return;
	1242	}
	1243
	1244	-int F77_isamax(const int N, const float X, const int *incX)
	1245	+CBLAS_INT F77_isamax(const CBLAS_INT N, const float X, const CBLAS_INT *incX)
	1246	{
	1247	if (N < 1 \|\| incX < 1) return(0);
	1248	return (cblas_isamax(N, X, incX)+1);
	1249	--- a/CBLAS/testing/c_sblas2.c
	1250	+++ b/CBLAS/testing/c_sblas2.c
	1251	@@ -8,12 +8,12 @@
	1252	#include "cblas.h"
	1253	#include "cblas_test.h"
	1254
	1255	-void F77_sgemv(int layout, char transp, int m, int n, float *alpha,
	1256	- float a, int lda, float x, int incx, float *beta,
	1257	- float y, int incy ) {
	1258	+void F77_sgemv(CBLAS_INT layout, char transp, CBLAS_INT m, CBLAS_INT n, float *alpha,
	1259	+ float a, CBLAS_INT lda, float x, CBLAS_INT incx, float *beta,
	1260	+ float y, CBLAS_INT incy ) {
	1261
	1262	float *A;
	1263	- int i,j,LDA;
	1264	+ CBLAS_INT i,j,LDA;
	1265	CBLAS_TRANSPOSE trans;
	1266
	1267	get_transpose_type(transp, &trans);
	1268	@@ -35,11 +35,11 @@ void F77_sgemv(int layout, char transp
	1269	m, n, alpha, a, lda, x, incx, beta, y, *incy );
	1270	}
	1271
	1272	-void F77_sger(int layout, int m, int n, float alpha, float x, int incx,
	1273	- float y, int incy, float a, int lda ) {
	1274	+void F77_sger(CBLAS_INT layout, CBLAS_INT m, CBLAS_INT n, float alpha, float x, CBLAS_INT incx,
	1275	+ float y, CBLAS_INT incy, float a, CBLAS_INT lda ) {
	1276
	1277	float *A;
	1278	- int i,j,LDA;
	1279	+ CBLAS_INT i,j,LDA;
	1280
	1281	if (*layout == TEST_ROW_MJR) {
	1282	LDA = *n+1;
	1283	@@ -60,10 +60,10 @@ void F77_sger(int layout, int m, int *
	1284	cblas_sger( CblasColMajor, m, n, alpha, x, incx, y, incy, a, lda );
	1285	}
	1286
	1287	-void F77_strmv(int layout, char uplow, char transp, char diagn,
	1288	- int n, float a, int lda, float x, int *incx) {
	1289	+void F77_strmv(CBLAS_INT layout, char uplow, char transp, char diagn,
	1290	+ CBLAS_INT n, float a, CBLAS_INT lda, float x, CBLAS_INT *incx) {
	1291	float *A;
	1292	- int i,j,LDA;
	1293	+ CBLAS_INT i,j,LDA;
	1294	CBLAS_TRANSPOSE trans;
	1295	CBLAS_UPLO uplo;
	1296	CBLAS_DIAG diag;
	1297	@@ -88,10 +88,10 @@ void F77_strmv(int layout, char uplow,
	1298	}
	1299	}
	1300
	1301	-void F77_strsv(int layout, char uplow, char transp, char diagn,
	1302	- int n, float a, int lda, float x, int *incx ) {
	1303	+void F77_strsv(CBLAS_INT layout, char uplow, char transp, char diagn,
	1304	+ CBLAS_INT n, float a, CBLAS_INT lda, float x, CBLAS_INT *incx ) {
	1305	float *A;
	1306	- int i,j,LDA;
	1307	+ CBLAS_INT i,j,LDA;
	1308	CBLAS_TRANSPOSE trans;
	1309	CBLAS_UPLO uplo;
	1310	CBLAS_DIAG diag;
	1311	@@ -112,11 +112,11 @@ void F77_strsv(int layout, char uplow,
	1312	else
	1313	cblas_strsv(CblasColMajor, uplo, trans, diag, n, a, lda, x, *incx );
	1314	}
	1315	-void F77_ssymv(int layout, char uplow, int n, float alpha, float *a,
	1316	- int lda, float x, int incx, float beta, float *y,
	1317	- int *incy) {
	1318	+void F77_ssymv(CBLAS_INT layout, char uplow, CBLAS_INT n, float alpha, float *a,
	1319	+ CBLAS_INT lda, float x, CBLAS_INT incx, float beta, float *y,
	1320	+ CBLAS_INT *incy) {
	1321	float *A;
	1322	- int i,j,LDA;
	1323	+ CBLAS_INT i,j,LDA;
	1324	CBLAS_UPLO uplo;
	1325
	1326	get_uplo_type(uplow,&uplo);
	1327	@@ -136,10 +136,10 @@ void F77_ssymv(int layout, char uplow,
	1328	beta, y, incy );
	1329	}
	1330
	1331	-void F77_ssyr(int layout, char uplow, int n, float alpha, float *x,
	1332	- int incx, float a, int *lda) {
	1333	+void F77_ssyr(CBLAS_INT layout, char uplow, CBLAS_INT n, float alpha, float *x,
	1334	+ CBLAS_INT incx, float a, CBLAS_INT *lda) {
	1335	float *A;
	1336	- int i,j,LDA;
	1337	+ CBLAS_INT i,j,LDA;
	1338	CBLAS_UPLO uplo;
	1339
	1340	get_uplo_type(uplow,&uplo);
	1341	@@ -160,10 +160,10 @@ void F77_ssyr(int layout, char uplow,
	1342	cblas_ssyr(CblasColMajor, uplo, n, alpha, x, incx, a, lda);
	1343	}
	1344
	1345	-void F77_ssyr2(int layout, char uplow, int n, float alpha, float *x,
	1346	- int incx, float y, int incy, float a, int *lda) {
	1347	+void F77_ssyr2(CBLAS_INT layout, char uplow, CBLAS_INT n, float alpha, float *x,
	1348	+ CBLAS_INT incx, float y, CBLAS_INT incy, float a, CBLAS_INT *lda) {
	1349	float *A;
	1350	- int i,j,LDA;
	1351	+ CBLAS_INT i,j,LDA;
	1352	CBLAS_UPLO uplo;
	1353
	1354	get_uplo_type(uplow,&uplo);
	1355	@@ -184,12 +184,12 @@ void F77_ssyr2(int layout, char uplow,
	1356	cblas_ssyr2(CblasColMajor, uplo, n, alpha, x, incx, y, incy, a, *lda);
	1357	}
	1358
	1359	-void F77_sgbmv(int layout, char transp, int m, int n, int kl, int ku,
	1360	- float alpha, float a, int lda, float x, int *incx,
	1361	- float beta, float y, int *incy ) {
	1362	+void F77_sgbmv(CBLAS_INT layout, char transp, CBLAS_INT m, CBLAS_INT n, CBLAS_INT kl, CBLAS_INT ku,
	1363	+ float alpha, float a, CBLAS_INT lda, float x, CBLAS_INT *incx,
	1364	+ float beta, float y, CBLAS_INT *incy ) {
	1365
	1366	float *A;
	1367	- int i,irow,j,jcol,LDA;
	1368	+ CBLAS_INT i,irow,j,jcol,LDA;
	1369	CBLAS_TRANSPOSE trans;
	1370
	1371	get_transpose_type(transp, &trans);
	1372	@@ -222,10 +222,10 @@ void F77_sgbmv(int layout, char transp
	1373	a, lda, x, incx, beta, y, incy );
	1374	}
	1375
	1376	-void F77_stbmv(int layout, char uplow, char transp, char diagn,
	1377	- int n, int k, float a, int lda, float x, int incx) {
	1378	+void F77_stbmv(CBLAS_INT layout, char uplow, char transp, char diagn,
	1379	+ CBLAS_INT n, CBLAS_INT k, float a, CBLAS_INT lda, float x, CBLAS_INT incx) {
	1380	float *A;
	1381	- int irow, jcol, i, j, LDA;
	1382	+ CBLAS_INT irow, jcol, i, j, LDA;
	1383	CBLAS_TRANSPOSE trans;
	1384	CBLAS_UPLO uplo;
	1385	CBLAS_DIAG diag;
	1386	@@ -268,10 +268,10 @@ void F77_stbmv(int layout, char uplow,
	1387	cblas_stbmv(CblasColMajor, uplo, trans, diag, n, k, a, lda, x, incx);
	1388	}
	1389
	1390	-void F77_stbsv(int layout, char uplow, char transp, char diagn,
	1391	- int n, int k, float a, int lda, float x, int incx) {
	1392	+void F77_stbsv(CBLAS_INT layout, char uplow, char transp, char diagn,
	1393	+ CBLAS_INT n, CBLAS_INT k, float a, CBLAS_INT lda, float x, CBLAS_INT incx) {
	1394	float *A;
	1395	- int irow, jcol, i, j, LDA;
	1396	+ CBLAS_INT irow, jcol, i, j, LDA;
	1397	CBLAS_TRANSPOSE trans;
	1398	CBLAS_UPLO uplo;
	1399	CBLAS_DIAG diag;
	1400	@@ -314,11 +314,11 @@ void F77_stbsv(int layout, char uplow,
	1401	cblas_stbsv(CblasColMajor, uplo, trans, diag, n, k, a, lda, x, incx);
	1402	}
	1403
	1404	-void F77_ssbmv(int layout, char uplow, int n, int k, float *alpha,
	1405	- float a, int lda, float x, int incx, float *beta,
	1406	- float y, int incy) {
	1407	+void F77_ssbmv(CBLAS_INT layout, char uplow, CBLAS_INT n, CBLAS_INT k, float *alpha,
	1408	+ float a, CBLAS_INT lda, float x, CBLAS_INT incx, float *beta,
	1409	+ float y, CBLAS_INT incy) {
	1410	float *A;
	1411	- int i,j,irow,jcol,LDA;
	1412	+ CBLAS_INT i,j,irow,jcol,LDA;
	1413	CBLAS_UPLO uplo;
	1414
	1415	get_uplo_type(uplow,&uplo);
	1416	@@ -359,10 +359,10 @@ void F77_ssbmv(int layout, char uplow,
	1417	beta, y, incy );
	1418	}
	1419
	1420	-void F77_sspmv(int layout, char uplow, int n, float alpha, float *ap,
	1421	- float x, int incx, float beta, float y, int *incy) {
	1422	+void F77_sspmv(CBLAS_INT layout, char uplow, CBLAS_INT n, float alpha, float *ap,
	1423	+ float x, CBLAS_INT incx, float beta, float y, CBLAS_INT *incy) {
	1424	float A,AP;
	1425	- int i,j,k,LDA;
	1426	+ CBLAS_INT i,j,k,LDA;
	1427	CBLAS_UPLO uplo;
	1428
	1429	get_uplo_type(uplow,&uplo);
	1430	@@ -396,10 +396,10 @@ void F77_sspmv(int layout, char uplow,
	1431	*incy );
	1432	}
	1433
	1434	-void F77_stpmv(int layout, char uplow, char transp, char diagn,
	1435	- int n, float ap, float x, int incx) {
	1436	+void F77_stpmv(CBLAS_INT layout, char uplow, char transp, char diagn,
	1437	+ CBLAS_INT n, float ap, float x, CBLAS_INT incx) {
	1438	float A, AP;
	1439	- int i, j, k, LDA;
	1440	+ CBLAS_INT i, j, k, LDA;
	1441	CBLAS_TRANSPOSE trans;
	1442	CBLAS_UPLO uplo;
	1443	CBLAS_DIAG diag;
	1444	@@ -435,10 +435,10 @@ void F77_stpmv(int layout, char uplow,
	1445	cblas_stpmv( CblasColMajor, uplo, trans, diag, n, ap, x, incx );
	1446	}
	1447
	1448	-void F77_stpsv(int layout, char uplow, char transp, char diagn,
	1449	- int n, float ap, float x, int incx) {
	1450	+void F77_stpsv(CBLAS_INT layout, char uplow, char transp, char diagn,
	1451	+ CBLAS_INT n, float ap, float x, CBLAS_INT incx) {
	1452	float A, AP;
	1453	- int i, j, k, LDA;
	1454	+ CBLAS_INT i, j, k, LDA;
	1455	CBLAS_TRANSPOSE trans;
	1456	CBLAS_UPLO uplo;
	1457	CBLAS_DIAG diag;
	1458	@@ -475,10 +475,10 @@ void F77_stpsv(int layout, char uplow,
	1459	cblas_stpsv( CblasColMajor, uplo, trans, diag, n, ap, x, incx );
	1460	}
	1461
	1462	-void F77_sspr(int layout, char uplow, int n, float alpha, float *x,
	1463	- int incx, float ap ){
	1464	+void F77_sspr(CBLAS_INT layout, char uplow, CBLAS_INT n, float alpha, float *x,
	1465	+ CBLAS_INT incx, float ap ){
	1466	float A, AP;
	1467	- int i,j,k,LDA;
	1468	+ CBLAS_INT i,j,k,LDA;
	1469	CBLAS_UPLO uplo;
	1470
	1471	get_uplo_type(uplow,&uplo);
	1472	@@ -526,10 +526,10 @@ void F77_sspr(int layout, char uplow,
	1473	cblas_sspr( CblasColMajor, uplo, n, alpha, x, *incx, ap );
	1474	}
	1475
	1476	-void F77_sspr2(int layout, char uplow, int n, float alpha, float *x,
	1477	- int incx, float y, int incy, float ap ){
	1478	+void F77_sspr2(CBLAS_INT layout, char uplow, CBLAS_INT n, float alpha, float *x,
	1479	+ CBLAS_INT incx, float y, CBLAS_INT incy, float ap ){
	1480	float A, AP;
	1481	- int i,j,k,LDA;
	1482	+ CBLAS_INT i,j,k,LDA;
	1483	CBLAS_UPLO uplo;
	1484
	1485	get_uplo_type(uplow,&uplo);
	1486	--- a/CBLAS/testing/c_sblas3.c
	1487	+++ b/CBLAS/testing/c_sblas3.c
	1488	@@ -9,12 +9,12 @@
	1489	#include "cblas.h"
	1490	#include "cblas_test.h"
	1491
	1492	-void F77_sgemm(int layout, char transpa, char transpb, int m, int *n,
	1493	- int k, float alpha, float a, int lda, float b, int ldb,
	1494	- float beta, float c, int *ldc ) {
	1495	+void F77_sgemm(CBLAS_INT layout, char transpa, char transpb, CBLAS_INT m, CBLAS_INT *n,
	1496	+ CBLAS_INT k, float alpha, float a, CBLAS_INT lda, float b, CBLAS_INT ldb,
	1497	+ float beta, float c, CBLAS_INT *ldc ) {
	1498
	1499	float A, B, *C;
	1500	- int i,j,LDA, LDB, LDC;
	1501	+ CBLAS_INT i,j,LDA, LDB, LDC;
	1502	CBLAS_TRANSPOSE transa, transb;
	1503
	1504	get_transpose_type(transpa, &transa);
	1505	@@ -70,12 +70,12 @@ void F77_sgemm(int layout, char transp
	1506	cblas_sgemm( UNDEFINED, transa, transb, m, n, k, alpha, a, *lda,
	1507	b, ldb, beta, c, *ldc );
	1508	}
	1509	-void F77_ssymm(int layout, char rtlf, char uplow, int m, int *n,
	1510	- float alpha, float a, int lda, float b, int *ldb,
	1511	- float beta, float c, int *ldc ) {
	1512	+void F77_ssymm(CBLAS_INT layout, char rtlf, char uplow, CBLAS_INT m, CBLAS_INT *n,
	1513	+ float alpha, float a, CBLAS_INT lda, float b, CBLAS_INT *ldb,
	1514	+ float beta, float c, CBLAS_INT *ldc ) {
	1515
	1516	float A, B, *C;
	1517	- int i,j,LDA, LDB, LDC;
	1518	+ CBLAS_INT i,j,LDA, LDB, LDC;
	1519	CBLAS_UPLO uplo;
	1520	CBLAS_SIDE side;
	1521
	1522	@@ -124,11 +124,11 @@ void F77_ssymm(int layout, char rtlf,
	1523	beta, c, ldc );
	1524	}
	1525
	1526	-void F77_ssyrk(int layout, char uplow, char transp, int n, int *k,
	1527	- float alpha, float a, int *lda,
	1528	- float beta, float c, int *ldc ) {
	1529	+void F77_ssyrk(CBLAS_INT layout, char uplow, char transp, CBLAS_INT n, CBLAS_INT *k,
	1530	+ float alpha, float a, CBLAS_INT *lda,
	1531	+ float beta, float c, CBLAS_INT *ldc ) {
	1532
	1533	- int i,j,LDA,LDC;
	1534	+ CBLAS_INT i,j,LDA,LDC;
	1535	float A, C;
	1536	CBLAS_UPLO uplo;
	1537	CBLAS_TRANSPOSE trans;
	1538	@@ -172,10 +172,10 @@ void F77_ssyrk(int layout, char uplow,
	1539	c, *ldc );
	1540	}
	1541
	1542	-void F77_ssyr2k(int layout, char uplow, char transp, int n, int *k,
	1543	- float alpha, float a, int lda, float b, int *ldb,
	1544	- float beta, float c, int *ldc ) {
	1545	- int i,j,LDA,LDB,LDC;
	1546	+void F77_ssyr2k(CBLAS_INT layout, char uplow, char transp, CBLAS_INT n, CBLAS_INT *k,
	1547	+ float alpha, float a, CBLAS_INT lda, float b, CBLAS_INT *ldb,
	1548	+ float beta, float c, CBLAS_INT *ldc ) {
	1549	+ CBLAS_INT i,j,LDA,LDB,LDC;
	1550	float A, B, *C;
	1551	CBLAS_UPLO uplo;
	1552	CBLAS_TRANSPOSE trans;
	1553	@@ -227,10 +227,10 @@ void F77_ssyr2k(int layout, char uplow
	1554	cblas_ssyr2k(UNDEFINED, uplo, trans, n, k, alpha, a, lda,
	1555	b, ldb, beta, c, *ldc );
	1556	}
	1557	-void F77_strmm(int layout, char rtlf, char uplow, char transp, char *diagn,
	1558	- int m, int n, float alpha, float a, int lda, float b,
	1559	- int *ldb) {
	1560	- int i,j,LDA,LDB;
	1561	+void F77_strmm(CBLAS_INT layout, char rtlf, char uplow, char transp, char *diagn,
	1562	+ CBLAS_INT m, CBLAS_INT n, float alpha, float a, CBLAS_INT lda, float b,
	1563	+ CBLAS_INT *ldb) {
	1564	+ CBLAS_INT i,j,LDA,LDB;
	1565	float A, B;
	1566	CBLAS_SIDE side;
	1567	CBLAS_DIAG diag;
	1568	@@ -278,10 +278,10 @@ void F77_strmm(int layout, char rtlf,
	1569	a, lda, b, ldb);
	1570	}
	1571
	1572	-void F77_strsm(int layout, char rtlf, char uplow, char transp, char *diagn,
	1573	- int m, int n, float alpha, float a, int lda, float b,
	1574	- int *ldb) {
	1575	- int i,j,LDA,LDB;
	1576	+void F77_strsm(CBLAS_INT layout, char rtlf, char uplow, char transp, char *diagn,
	1577	+ CBLAS_INT m, CBLAS_INT n, float alpha, float a, CBLAS_INT lda, float b,
	1578	+ CBLAS_INT *ldb) {
	1579	+ CBLAS_INT i,j,LDA,LDB;
	1580	float A, B;
	1581	CBLAS_SIDE side;
	1582	CBLAS_DIAG diag;
	1583	--- a/CBLAS/testing/c_xerbla.c
	1584	+++ b/CBLAS/testing/c_xerbla.c
	1585	@@ -7,8 +7,8 @@
	1586
	1587	void cblas_xerbla(CBLAS_INT info, const char rout, const char form, ...)
	1588	{
	1589	- extern int cblas_lerr, cblas_info, cblas_ok;
	1590	- extern int link_xerbla;
	1591	+ extern CBLAS_INT cblas_lerr, cblas_info, cblas_ok;
	1592	+ extern CBLAS_INT link_xerbla;
	1593	extern int RowMajorStrg;
	1594	extern char *cblas_rout;
	1595
	1596	@@ -101,9 +101,9 @@ void F77_xerbla(char srname, void vinf
	1597	F77_Integer i;
	1598	extern F77_Integer link_xerbla;
	1599	#else
	1600	- int *info=vinfo;
	1601	- int i;
	1602	- extern int link_xerbla;
	1603	+ CBLAS_INT *info=vinfo;
	1604	+ CBLAS_INT i;
	1605	+ extern CBLAS_INT link_xerbla;
	1606	#endif
	1607	#ifdef F77_Char
	1608	srname = F2C_STR(F77_srname, XerblaStrLen);
	1609	--- a/CBLAS/testing/c_z2chke.c
	1610	+++ b/CBLAS/testing/c_z2chke.c
	1611	@@ -3,8 +3,8 @@
	1612	#include "cblas.h"
	1613	#include "cblas_test.h"
	1614
	1615	-int cblas_ok, cblas_lerr, cblas_info;
	1616	-int link_xerbla=TRUE;
	1617	+CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
	1618	+CBLAS_INT link_xerbla=TRUE;
	1619	char *cblas_rout;
	1620
	1621	#ifdef F77_Char
	1622	@@ -14,8 +14,8 @@ void F77_xerbla(char srname, void vinf
	1623	#endif
	1624
	1625	void chkxer(void) {
	1626	- extern int cblas_ok, cblas_lerr, cblas_info;
	1627	- extern int link_xerbla;
	1628	+ extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
	1629	+ extern CBLAS_INT link_xerbla;
	1630	extern char *cblas_rout;
	1631	if (cblas_lerr == 1 ) {
	1632	printf("*** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s ***\n", cblas_info, cblas_rout);
	1633	@@ -32,7 +32,7 @@ void F77_z2chke(char *rout) {
	1634	ALPHA[2] = {0.0,0.0},
	1635	BETA[2] = {0.0,0.0},
	1636	RALPHA = 0.0;
	1637	- extern int cblas_info, cblas_lerr, cblas_ok;
	1638	+ extern CBLAS_INT cblas_info, cblas_lerr, cblas_ok;
	1639	extern int RowMajorStrg;
	1640	extern char *cblas_rout;
	1641
	1642	--- a/CBLAS/testing/c_z3chke.c
	1643	+++ b/CBLAS/testing/c_z3chke.c
	1644	@@ -3,8 +3,8 @@
	1645	#include "cblas.h"
	1646	#include "cblas_test.h"
	1647
	1648	-int cblas_ok, cblas_lerr, cblas_info;
	1649	-int link_xerbla=TRUE;
	1650	+CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
	1651	+CBLAS_INT link_xerbla=TRUE;
	1652	char *cblas_rout;
	1653
	1654	#ifdef F77_Char
	1655	@@ -14,8 +14,8 @@ void F77_xerbla(char srname, void vinf
	1656	#endif
	1657
	1658	void chkxer(void) {
	1659	- extern int cblas_ok, cblas_lerr, cblas_info;
	1660	- extern int link_xerbla;
	1661	+ extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
	1662	+ extern CBLAS_INT link_xerbla;
	1663	extern char *cblas_rout;
	1664	if (cblas_lerr == 1 ) {
	1665	printf("*** ILLEGAL VALUE OF PARAMETER NUMBER %d NOT DETECTED BY %s ***\n", cblas_info, cblas_rout);
	1666	@@ -32,7 +32,7 @@ void F77_z3chke(char * rout) {
	1667	ALPHA[2] = {0.0,0.0},
	1668	BETA[2] = {0.0,0.0},
	1669	RALPHA = 0.0, RBETA = 0.0;
	1670	- extern int cblas_info, cblas_lerr, cblas_ok;
	1671	+ extern CBLAS_INT cblas_info, cblas_lerr, cblas_ok;
	1672	extern int RowMajorStrg;
	1673	extern char *cblas_rout;
	1674
	1675	--- a/CBLAS/testing/c_zblas1.c
	1676	+++ b/CBLAS/testing/c_zblas1.c
	1677	@@ -8,67 +8,67 @@
	1678	*/
	1679	#include "cblas_test.h"
	1680	#include "cblas.h"
	1681	-void F77_zaxpy(const int N, const void alpha, void *X,
	1682	- const int incX, void Y, const int *incY)
	1683	+void F77_zaxpy(const CBLAS_INT N, const void alpha, void *X,
	1684	+ const CBLAS_INT incX, void Y, const CBLAS_INT *incY)
	1685	{
	1686	cblas_zaxpy(N, alpha, X, incX, Y, *incY);
	1687	return;
	1688	}
	1689
	1690	-void F77_zcopy(const int N, void X, const int *incX,
	1691	- void Y, const int incY)
	1692	+void F77_zcopy(const CBLAS_INT N, void X, const CBLAS_INT *incX,
	1693	+ void Y, const CBLAS_INT incY)
	1694	{
	1695	cblas_zcopy(N, X, incX, Y, *incY);
	1696	return;
	1697	}
	1698
	1699	-void F77_zdotc(const int N, const void X, const int *incX,
	1700	- const void Y, const int incY,void *dotc)
	1701	+void F77_zdotc(const CBLAS_INT N, const void X, const CBLAS_INT *incX,
	1702	+ const void Y, const CBLAS_INT incY,void *dotc)
	1703	{
	1704	cblas_zdotc_sub(N, X, incX, Y, *incY, dotc);
	1705	return;
	1706	}
	1707
	1708	-void F77_zdotu(const int N, void X, const int *incX,
	1709	- void Y, const int incY,void *dotu)
	1710	+void F77_zdotu(const CBLAS_INT N, void X, const CBLAS_INT *incX,
	1711	+ void Y, const CBLAS_INT incY,void *dotu)
	1712	{
	1713	cblas_zdotu_sub(N, X, incX, Y, *incY, dotu);
	1714	return;
	1715	}
	1716
	1717	-void F77_zdscal(const int N, const double alpha, void *X,
	1718	- const int *incX)
	1719	+void F77_zdscal(const CBLAS_INT N, const double alpha, void *X,
	1720	+ const CBLAS_INT *incX)
	1721	{
	1722	cblas_zdscal(N, alpha, X, *incX);
	1723	return;
	1724	}
	1725
	1726	-void F77_zscal(const int N, const void alpha, void X,
	1727	- const int *incX)
	1728	+void F77_zscal(const CBLAS_INT N, const void alpha, void X,
	1729	+ const CBLAS_INT *incX)
	1730	{
	1731	cblas_zscal(N, alpha, X, incX);
	1732	return;
	1733	}
	1734
	1735	-void F77_zswap( const int N, void X, const int *incX,
	1736	- void Y, const int incY)
	1737	+void F77_zswap( const CBLAS_INT N, void X, const CBLAS_INT *incX,
	1738	+ void Y, const CBLAS_INT incY)
	1739	{
	1740	cblas_zswap(N,X,incX,Y,*incY);
	1741	return;
	1742	}
	1743
	1744	-int F77_izamax(const int N, const void X, const int *incX)
	1745	+CBLAS_INT F77_izamax(const CBLAS_INT N, const void X, const CBLAS_INT *incX)
	1746	{
	1747	if (N < 1 \|\| incX < 1) return(0);
	1748	return(cblas_izamax(N, X, incX)+1);
	1749	}
	1750
	1751	-double F77_dznrm2(const int N, const void X, const int *incX)
	1752	+double F77_dznrm2(const CBLAS_INT N, const void X, const CBLAS_INT *incX)
	1753	{
	1754	return cblas_dznrm2(N, X, incX);
	1755	}
	1756
	1757	-double F77_dzasum(const int N, void X, const int *incX)
	1758	+double F77_dzasum(const CBLAS_INT N, void X, const CBLAS_INT *incX)
	1759	{
	1760	return cblas_dzasum(N, X, incX);
	1761	}
	1762	--- a/CBLAS/testing/c_zblas2.c
	1763	+++ b/CBLAS/testing/c_zblas2.c
	1764	@@ -8,13 +8,13 @@
	1765	#include "cblas.h"
	1766	#include "cblas_test.h"
	1767
	1768	-void F77_zgemv(int layout, char transp, int m, int n,
	1769	+void F77_zgemv(CBLAS_INT layout, char transp, CBLAS_INT m, CBLAS_INT n,
	1770	const void *alpha,
	1771	- CBLAS_TEST_ZOMPLEX a, int lda, const void x, int incx,
	1772	- const void beta, void y, int *incy) {
	1773	+ CBLAS_TEST_ZOMPLEX a, CBLAS_INT lda, const void x, CBLAS_INT incx,
	1774	+ const void beta, void y, CBLAS_INT *incy) {
	1775
	1776	CBLAS_TEST_ZOMPLEX *A;
	1777	- int i,j,LDA;
	1778	+ CBLAS_INT i,j,LDA;
	1779	CBLAS_TRANSPOSE trans;
	1780
	1781	get_transpose_type(transp, &trans);
	1782	@@ -38,13 +38,13 @@ void F77_zgemv(int layout, char transp
	1783	m, n, alpha, a, lda, x, incx, beta, y, *incy );
	1784	}
	1785
	1786	-void F77_zgbmv(int layout, char transp, int m, int n, int kl, int ku,
	1787	- CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a, int *lda,
	1788	- CBLAS_TEST_ZOMPLEX x, int incx,
	1789	- CBLAS_TEST_ZOMPLEX beta, CBLAS_TEST_ZOMPLEX y, int *incy) {
	1790	+void F77_zgbmv(CBLAS_INT layout, char transp, CBLAS_INT m, CBLAS_INT n, CBLAS_INT kl, CBLAS_INT ku,
	1791	+ CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a, CBLAS_INT *lda,
	1792	+ CBLAS_TEST_ZOMPLEX x, CBLAS_INT incx,
	1793	+ CBLAS_TEST_ZOMPLEX beta, CBLAS_TEST_ZOMPLEX y, CBLAS_INT *incy) {
	1794
	1795	CBLAS_TEST_ZOMPLEX *A;
	1796	- int i,j,irow,jcol,LDA;
	1797	+ CBLAS_INT i,j,irow,jcol,LDA;
	1798	CBLAS_TRANSPOSE trans;
	1799
	1800	get_transpose_type(transp, &trans);
	1801	@@ -85,12 +85,12 @@ void F77_zgbmv(int layout, char transp
	1802	incx, beta, y, incy );
	1803	}
	1804
	1805	-void F77_zgeru(int layout, int m, int n, CBLAS_TEST_ZOMPLEX alpha,
	1806	- CBLAS_TEST_ZOMPLEX x, int incx, CBLAS_TEST_ZOMPLEX y, int incy,
	1807	- CBLAS_TEST_ZOMPLEX a, int lda){
	1808	+void F77_zgeru(CBLAS_INT layout, CBLAS_INT m, CBLAS_INT n, CBLAS_TEST_ZOMPLEX alpha,
	1809	+ CBLAS_TEST_ZOMPLEX x, CBLAS_INT incx, CBLAS_TEST_ZOMPLEX y, CBLAS_INT incy,
	1810	+ CBLAS_TEST_ZOMPLEX a, CBLAS_INT lda){
	1811
	1812	CBLAS_TEST_ZOMPLEX *A;
	1813	- int i,j,LDA;
	1814	+ CBLAS_INT i,j,LDA;
	1815
	1816	if (*layout == TEST_ROW_MJR) {
	1817	LDA = *n+1;
	1818	@@ -114,11 +114,11 @@ void F77_zgeru(int layout, int m, int
	1819	cblas_zgeru( UNDEFINED, m, n, alpha, x, incx, y, incy, a, *lda );
	1820	}
	1821
	1822	-void F77_zgerc(int layout, int m, int n, CBLAS_TEST_ZOMPLEX alpha,
	1823	- CBLAS_TEST_ZOMPLEX x, int incx, CBLAS_TEST_ZOMPLEX y, int incy,
	1824	- CBLAS_TEST_ZOMPLEX a, int lda) {
	1825	+void F77_zgerc(CBLAS_INT layout, CBLAS_INT m, CBLAS_INT n, CBLAS_TEST_ZOMPLEX alpha,
	1826	+ CBLAS_TEST_ZOMPLEX x, CBLAS_INT incx, CBLAS_TEST_ZOMPLEX y, CBLAS_INT incy,
	1827	+ CBLAS_TEST_ZOMPLEX a, CBLAS_INT lda) {
	1828	CBLAS_TEST_ZOMPLEX *A;
	1829	- int i,j,LDA;
	1830	+ CBLAS_INT i,j,LDA;
	1831
	1832	if (*layout == TEST_ROW_MJR) {
	1833	LDA = *n+1;
	1834	@@ -142,12 +142,12 @@ void F77_zgerc(int layout, int m, int
	1835	cblas_zgerc( UNDEFINED, m, n, alpha, x, incx, y, incy, a, *lda );
	1836	}
	1837
	1838	-void F77_zhemv(int layout, char uplow, int n, CBLAS_TEST_ZOMPLEX alpha,
	1839	- CBLAS_TEST_ZOMPLEX a, int lda, CBLAS_TEST_ZOMPLEX *x,
	1840	- int incx, CBLAS_TEST_ZOMPLEX beta, CBLAS_TEST_ZOMPLEX y, int incy){
	1841	+void F77_zhemv(CBLAS_INT layout, char uplow, CBLAS_INT n, CBLAS_TEST_ZOMPLEX alpha,
	1842	+ CBLAS_TEST_ZOMPLEX a, CBLAS_INT lda, CBLAS_TEST_ZOMPLEX *x,
	1843	+ CBLAS_INT incx, CBLAS_TEST_ZOMPLEX beta, CBLAS_TEST_ZOMPLEX y, CBLAS_INT incy){
	1844
	1845	CBLAS_TEST_ZOMPLEX *A;
	1846	- int i,j,LDA;
	1847	+ CBLAS_INT i,j,LDA;
	1848	CBLAS_UPLO uplo;
	1849
	1850	get_uplo_type(uplow,&uplo);
	1851	@@ -172,13 +172,13 @@ void F77_zhemv(int layout, char uplow,
	1852	beta, y, *incy );
	1853	}
	1854
	1855	-void F77_zhbmv(int layout, char uplow, int n, int k,
	1856	- CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a, int *lda,
	1857	- CBLAS_TEST_ZOMPLEX x, int incx, CBLAS_TEST_ZOMPLEX *beta,
	1858	- CBLAS_TEST_ZOMPLEX y, int incy){
	1859	+void F77_zhbmv(CBLAS_INT layout, char uplow, CBLAS_INT n, CBLAS_INT k,
	1860	+ CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a, CBLAS_INT *lda,
	1861	+ CBLAS_TEST_ZOMPLEX x, CBLAS_INT incx, CBLAS_TEST_ZOMPLEX *beta,
	1862	+ CBLAS_TEST_ZOMPLEX y, CBLAS_INT incy){
	1863
	1864	CBLAS_TEST_ZOMPLEX *A;
	1865	-int i,irow,j,jcol,LDA;
	1866	+CBLAS_INT i,irow,j,jcol,LDA;
	1867
	1868	CBLAS_UPLO uplo;
	1869
	1870	@@ -236,12 +236,12 @@ int i,irow,j,jcol,LDA;
	1871	beta, y, *incy );
	1872	}
	1873
	1874	-void F77_zhpmv(int layout, char uplow, int n, CBLAS_TEST_ZOMPLEX alpha,
	1875	- CBLAS_TEST_ZOMPLEX ap, CBLAS_TEST_ZOMPLEX x, int *incx,
	1876	- CBLAS_TEST_ZOMPLEX beta, CBLAS_TEST_ZOMPLEX y, int *incy){
	1877	+void F77_zhpmv(CBLAS_INT layout, char uplow, CBLAS_INT n, CBLAS_TEST_ZOMPLEX alpha,
	1878	+ CBLAS_TEST_ZOMPLEX ap, CBLAS_TEST_ZOMPLEX x, CBLAS_INT *incx,
	1879	+ CBLAS_TEST_ZOMPLEX beta, CBLAS_TEST_ZOMPLEX y, CBLAS_INT *incy){
	1880
	1881	CBLAS_TEST_ZOMPLEX A, AP;
	1882	- int i,j,k,LDA;
	1883	+ CBLAS_INT i,j,k,LDA;
	1884	CBLAS_UPLO uplo;
	1885
	1886	get_uplo_type(uplow,&uplo);
	1887	@@ -292,11 +292,11 @@ void F77_zhpmv(int layout, char uplow,
	1888	*incy );
	1889	}
	1890
	1891	-void F77_ztbmv(int layout, char uplow, char transp, char diagn,
	1892	- int n, int k, CBLAS_TEST_ZOMPLEX a, int lda, CBLAS_TEST_ZOMPLEX *x,
	1893	- int *incx) {
	1894	+void F77_ztbmv(CBLAS_INT layout, char uplow, char transp, char diagn,
	1895	+ CBLAS_INT n, CBLAS_INT k, CBLAS_TEST_ZOMPLEX a, CBLAS_INT lda, CBLAS_TEST_ZOMPLEX *x,
	1896	+ CBLAS_INT *incx) {
	1897	CBLAS_TEST_ZOMPLEX *A;
	1898	- int irow, jcol, i, j, LDA;
	1899	+ CBLAS_INT irow, jcol, i, j, LDA;
	1900	CBLAS_TRANSPOSE trans;
	1901	CBLAS_UPLO uplo;
	1902	CBLAS_DIAG diag;
	1903	@@ -355,12 +355,12 @@ void F77_ztbmv(int layout, char uplow,
	1904	cblas_ztbmv(UNDEFINED, uplo, trans, diag, n, k, a, lda, x, incx);
	1905	}
	1906
	1907	-void F77_ztbsv(int layout, char uplow, char transp, char diagn,
	1908	- int n, int k, CBLAS_TEST_ZOMPLEX a, int lda, CBLAS_TEST_ZOMPLEX *x,
	1909	- int *incx) {
	1910	+void F77_ztbsv(CBLAS_INT layout, char uplow, char transp, char diagn,
	1911	+ CBLAS_INT n, CBLAS_INT k, CBLAS_TEST_ZOMPLEX a, CBLAS_INT lda, CBLAS_TEST_ZOMPLEX *x,
	1912	+ CBLAS_INT *incx) {
	1913
	1914	CBLAS_TEST_ZOMPLEX *A;
	1915	- int irow, jcol, i, j, LDA;
	1916	+ CBLAS_INT irow, jcol, i, j, LDA;
	1917	CBLAS_TRANSPOSE trans;
	1918	CBLAS_UPLO uplo;
	1919	CBLAS_DIAG diag;
	1920	@@ -419,10 +419,10 @@ void F77_ztbsv(int layout, char uplow,
	1921	cblas_ztbsv(UNDEFINED, uplo, trans, diag, n, k, a, lda, x, incx);
	1922	}
	1923
	1924	-void F77_ztpmv(int layout, char uplow, char transp, char diagn,
	1925	- int n, CBLAS_TEST_ZOMPLEX ap, CBLAS_TEST_ZOMPLEX x, int incx) {
	1926	+void F77_ztpmv(CBLAS_INT layout, char uplow, char transp, char diagn,
	1927	+ CBLAS_INT n, CBLAS_TEST_ZOMPLEX ap, CBLAS_TEST_ZOMPLEX x, CBLAS_INT incx) {
	1928	CBLAS_TEST_ZOMPLEX A, AP;
	1929	- int i, j, k, LDA;
	1930	+ CBLAS_INT i, j, k, LDA;
	1931	CBLAS_TRANSPOSE trans;
	1932	CBLAS_UPLO uplo;
	1933	CBLAS_DIAG diag;
	1934	@@ -474,10 +474,10 @@ void F77_ztpmv(int layout, char uplow,
	1935	cblas_ztpmv( UNDEFINED, uplo, trans, diag, n, ap, x, incx );
	1936	}
	1937
	1938	-void F77_ztpsv(int layout, char uplow, char transp, char diagn,
	1939	- int n, CBLAS_TEST_ZOMPLEX ap, CBLAS_TEST_ZOMPLEX x, int incx) {
	1940	+void F77_ztpsv(CBLAS_INT layout, char uplow, char transp, char diagn,
	1941	+ CBLAS_INT n, CBLAS_TEST_ZOMPLEX ap, CBLAS_TEST_ZOMPLEX x, CBLAS_INT incx) {
	1942	CBLAS_TEST_ZOMPLEX A, AP;
	1943	- int i, j, k, LDA;
	1944	+ CBLAS_INT i, j, k, LDA;
	1945	CBLAS_TRANSPOSE trans;
	1946	CBLAS_UPLO uplo;
	1947	CBLAS_DIAG diag;
	1948	@@ -529,11 +529,11 @@ void F77_ztpsv(int layout, char uplow,
	1949	cblas_ztpsv( UNDEFINED, uplo, trans, diag, n, ap, x, incx );
	1950	}
	1951
	1952	-void F77_ztrmv(int layout, char uplow, char transp, char diagn,
	1953	- int n, CBLAS_TEST_ZOMPLEX a, int lda, CBLAS_TEST_ZOMPLEX x,
	1954	- int *incx) {
	1955	+void F77_ztrmv(CBLAS_INT layout, char uplow, char transp, char diagn,
	1956	+ CBLAS_INT n, CBLAS_TEST_ZOMPLEX a, CBLAS_INT lda, CBLAS_TEST_ZOMPLEX x,
	1957	+ CBLAS_INT *incx) {
	1958	CBLAS_TEST_ZOMPLEX *A;
	1959	- int i,j,LDA;
	1960	+ CBLAS_INT i,j,LDA;
	1961	CBLAS_TRANSPOSE trans;
	1962	CBLAS_UPLO uplo;
	1963	CBLAS_DIAG diag;
	1964	@@ -558,11 +558,11 @@ void F77_ztrmv(int layout, char uplow,
	1965	else
	1966	cblas_ztrmv(UNDEFINED, uplo, trans, diag, n, a, lda, x, *incx);
	1967	}
	1968	-void F77_ztrsv(int layout, char uplow, char transp, char diagn,
	1969	- int n, CBLAS_TEST_ZOMPLEX a, int lda, CBLAS_TEST_ZOMPLEX x,
	1970	- int *incx) {
	1971	+void F77_ztrsv(CBLAS_INT layout, char uplow, char transp, char diagn,
	1972	+ CBLAS_INT n, CBLAS_TEST_ZOMPLEX a, CBLAS_INT lda, CBLAS_TEST_ZOMPLEX x,
	1973	+ CBLAS_INT *incx) {
	1974	CBLAS_TEST_ZOMPLEX *A;
	1975	- int i,j,LDA;
	1976	+ CBLAS_INT i,j,LDA;
	1977	CBLAS_TRANSPOSE trans;
	1978	CBLAS_UPLO uplo;
	1979	CBLAS_DIAG diag;
	1980	@@ -588,10 +588,10 @@ void F77_ztrsv(int layout, char uplow,
	1981	cblas_ztrsv(UNDEFINED, uplo, trans, diag, n, a, lda, x, *incx );
	1982	}
	1983
	1984	-void F77_zhpr(int layout, char uplow, int n, double alpha,
	1985	- CBLAS_TEST_ZOMPLEX x, int incx, CBLAS_TEST_ZOMPLEX *ap) {
	1986	+void F77_zhpr(CBLAS_INT layout, char uplow, CBLAS_INT n, double alpha,
	1987	+ CBLAS_TEST_ZOMPLEX x, CBLAS_INT incx, CBLAS_TEST_ZOMPLEX *ap) {
	1988	CBLAS_TEST_ZOMPLEX A, AP;
	1989	- int i,j,k,LDA;
	1990	+ CBLAS_INT i,j,k,LDA;
	1991	CBLAS_UPLO uplo;
	1992
	1993	get_uplo_type(uplow,&uplo);
	1994	@@ -663,11 +663,11 @@ void F77_zhpr(int layout, char uplow,
	1995	cblas_zhpr(UNDEFINED, uplo, n, alpha, x, *incx, ap );
	1996	}
	1997
	1998	-void F77_zhpr2(int layout, char uplow, int n, CBLAS_TEST_ZOMPLEX alpha,
	1999	- CBLAS_TEST_ZOMPLEX x, int incx, CBLAS_TEST_ZOMPLEX y, int incy,
	2000	+void F77_zhpr2(CBLAS_INT layout, char uplow, CBLAS_INT n, CBLAS_TEST_ZOMPLEX alpha,
	2001	+ CBLAS_TEST_ZOMPLEX x, CBLAS_INT incx, CBLAS_TEST_ZOMPLEX y, CBLAS_INT incy,
	2002	CBLAS_TEST_ZOMPLEX *ap) {
	2003	CBLAS_TEST_ZOMPLEX A, AP;
	2004	- int i,j,k,LDA;
	2005	+ CBLAS_INT i,j,k,LDA;
	2006	CBLAS_UPLO uplo;
	2007
	2008	get_uplo_type(uplow,&uplo);
	2009	@@ -740,10 +740,10 @@ void F77_zhpr2(int layout, char uplow,
	2010	cblas_zhpr2( UNDEFINED, uplo, n, alpha, x, incx, y, *incy, ap );
	2011	}
	2012
	2013	-void F77_zher(int layout, char uplow, int n, double alpha,
	2014	- CBLAS_TEST_ZOMPLEX x, int incx, CBLAS_TEST_ZOMPLEX a, int lda) {
	2015	+void F77_zher(CBLAS_INT layout, char uplow, CBLAS_INT n, double alpha,
	2016	+ CBLAS_TEST_ZOMPLEX x, CBLAS_INT incx, CBLAS_TEST_ZOMPLEX a, CBLAS_INT lda) {
	2017	CBLAS_TEST_ZOMPLEX *A;
	2018	- int i,j,LDA;
	2019	+ CBLAS_INT i,j,LDA;
	2020	CBLAS_UPLO uplo;
	2021
	2022	get_uplo_type(uplow,&uplo);
	2023	@@ -772,12 +772,12 @@ void F77_zher(int layout, char uplow,
	2024	cblas_zher( UNDEFINED, uplo, n, alpha, x, incx, a, lda );
	2025	}
	2026
	2027	-void F77_zher2(int layout, char uplow, int n, CBLAS_TEST_ZOMPLEX alpha,
	2028	- CBLAS_TEST_ZOMPLEX x, int incx, CBLAS_TEST_ZOMPLEX y, int incy,
	2029	- CBLAS_TEST_ZOMPLEX a, int lda) {
	2030	+void F77_zher2(CBLAS_INT layout, char uplow, CBLAS_INT n, CBLAS_TEST_ZOMPLEX alpha,
	2031	+ CBLAS_TEST_ZOMPLEX x, CBLAS_INT incx, CBLAS_TEST_ZOMPLEX y, CBLAS_INT incy,
	2032	+ CBLAS_TEST_ZOMPLEX a, CBLAS_INT lda) {
	2033
	2034	CBLAS_TEST_ZOMPLEX *A;
	2035	- int i,j,LDA;
	2036	+ CBLAS_INT i,j,LDA;
	2037	CBLAS_UPLO uplo;
	2038
	2039	get_uplo_type(uplow,&uplo);
	2040	--- a/CBLAS/testing/c_zblas3.c
	2041	+++ b/CBLAS/testing/c_zblas3.c
	2042	@@ -11,13 +11,13 @@
	2043	#define TEST_ROW_MJR 1
	2044	#define UNDEFINED -1
	2045
	2046	-void F77_zgemm(int layout, char transpa, char transpb, int m, int *n,
	2047	- int k, CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a, int lda,
	2048	- CBLAS_TEST_ZOMPLEX b, int ldb, CBLAS_TEST_ZOMPLEX *beta,
	2049	- CBLAS_TEST_ZOMPLEX c, int ldc ) {
	2050	+void F77_zgemm(CBLAS_INT layout, char transpa, char transpb, CBLAS_INT m, CBLAS_INT *n,
	2051	+ CBLAS_INT k, CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a, CBLAS_INT lda,
	2052	+ CBLAS_TEST_ZOMPLEX b, CBLAS_INT ldb, CBLAS_TEST_ZOMPLEX *beta,
	2053	+ CBLAS_TEST_ZOMPLEX c, CBLAS_INT ldc ) {
	2054
	2055	CBLAS_TEST_ZOMPLEX A, B, *C;
	2056	- int i,j,LDA, LDB, LDC;
	2057	+ CBLAS_INT i,j,LDA, LDB, LDC;
	2058	CBLAS_TRANSPOSE transa, transb;
	2059
	2060	get_transpose_type(transpa, &transa);
	2061	@@ -87,13 +87,13 @@ void F77_zgemm(int layout, char transp
	2062	cblas_zgemm( UNDEFINED, transa, transb, m, n, k, alpha, a, lda,
	2063	b, ldb, beta, c, ldc );
	2064	}
	2065	-void F77_zhemm(int layout, char rtlf, char uplow, int m, int *n,
	2066	- CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a, int *lda,
	2067	- CBLAS_TEST_ZOMPLEX b, int ldb, CBLAS_TEST_ZOMPLEX *beta,
	2068	- CBLAS_TEST_ZOMPLEX c, int ldc ) {
	2069	+void F77_zhemm(CBLAS_INT layout, char rtlf, char uplow, CBLAS_INT m, CBLAS_INT *n,
	2070	+ CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a, CBLAS_INT *lda,
	2071	+ CBLAS_TEST_ZOMPLEX b, CBLAS_INT ldb, CBLAS_TEST_ZOMPLEX *beta,
	2072	+ CBLAS_TEST_ZOMPLEX c, CBLAS_INT ldc ) {
	2073
	2074	CBLAS_TEST_ZOMPLEX A, B, *C;
	2075	- int i,j,LDA, LDB, LDC;
	2076	+ CBLAS_INT i,j,LDA, LDB, LDC;
	2077	CBLAS_UPLO uplo;
	2078	CBLAS_SIDE side;
	2079
	2080	@@ -151,13 +151,13 @@ void F77_zhemm(int layout, char rtlf,
	2081	cblas_zhemm( UNDEFINED, side, uplo, m, n, alpha, a, lda, b, ldb,
	2082	beta, c, *ldc );
	2083	}
	2084	-void F77_zsymm(int layout, char rtlf, char uplow, int m, int *n,
	2085	- CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a, int *lda,
	2086	- CBLAS_TEST_ZOMPLEX b, int ldb, CBLAS_TEST_ZOMPLEX *beta,
	2087	- CBLAS_TEST_ZOMPLEX c, int ldc ) {
	2088	+void F77_zsymm(CBLAS_INT layout, char rtlf, char uplow, CBLAS_INT m, CBLAS_INT *n,
	2089	+ CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a, CBLAS_INT *lda,
	2090	+ CBLAS_TEST_ZOMPLEX b, CBLAS_INT ldb, CBLAS_TEST_ZOMPLEX *beta,
	2091	+ CBLAS_TEST_ZOMPLEX c, CBLAS_INT ldc ) {
	2092
	2093	CBLAS_TEST_ZOMPLEX A, B, *C;
	2094	- int i,j,LDA, LDB, LDC;
	2095	+ CBLAS_INT i,j,LDA, LDB, LDC;
	2096	CBLAS_UPLO uplo;
	2097	CBLAS_SIDE side;
	2098
	2099	@@ -206,11 +206,11 @@ void F77_zsymm(int layout, char rtlf,
	2100	beta, c, *ldc );
	2101	}
	2102
	2103	-void F77_zherk(int layout, char uplow, char transp, int n, int *k,
	2104	- double alpha, CBLAS_TEST_ZOMPLEX a, int *lda,
	2105	- double beta, CBLAS_TEST_ZOMPLEX c, int *ldc ) {
	2106	+void F77_zherk(CBLAS_INT layout, char uplow, char transp, CBLAS_INT n, CBLAS_INT *k,
	2107	+ double alpha, CBLAS_TEST_ZOMPLEX a, CBLAS_INT *lda,
	2108	+ double beta, CBLAS_TEST_ZOMPLEX c, CBLAS_INT *ldc ) {
	2109
	2110	- int i,j,LDA,LDC;
	2111	+ CBLAS_INT i,j,LDA,LDC;
	2112	CBLAS_TEST_ZOMPLEX A, C;
	2113	CBLAS_UPLO uplo;
	2114	CBLAS_TRANSPOSE trans;
	2115	@@ -262,11 +262,11 @@ void F77_zherk(int layout, char uplow,
	2116	c, *ldc );
	2117	}
	2118
	2119	-void F77_zsyrk(int layout, char uplow, char transp, int n, int *k,
	2120	- CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a, int *lda,
	2121	- CBLAS_TEST_ZOMPLEX beta, CBLAS_TEST_ZOMPLEX c, int *ldc ) {
	2122	+void F77_zsyrk(CBLAS_INT layout, char uplow, char transp, CBLAS_INT n, CBLAS_INT *k,
	2123	+ CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a, CBLAS_INT *lda,
	2124	+ CBLAS_TEST_ZOMPLEX beta, CBLAS_TEST_ZOMPLEX c, CBLAS_INT *ldc ) {
	2125
	2126	- int i,j,LDA,LDC;
	2127	+ CBLAS_INT i,j,LDA,LDC;
	2128	CBLAS_TEST_ZOMPLEX A, C;
	2129	CBLAS_UPLO uplo;
	2130	CBLAS_TRANSPOSE trans;
	2131	@@ -317,11 +317,11 @@ void F77_zsyrk(int layout, char uplow,
	2132	cblas_zsyrk(UNDEFINED, uplo, trans, n, k, alpha, a, *lda, beta,
	2133	c, *ldc );
	2134	}
	2135	-void F77_zher2k(int layout, char uplow, char transp, int n, int *k,
	2136	- CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a, int *lda,
	2137	- CBLAS_TEST_ZOMPLEX b, int ldb, double *beta,
	2138	- CBLAS_TEST_ZOMPLEX c, int ldc ) {
	2139	- int i,j,LDA,LDB,LDC;
	2140	+void F77_zher2k(CBLAS_INT layout, char uplow, char transp, CBLAS_INT n, CBLAS_INT *k,
	2141	+ CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a, CBLAS_INT *lda,
	2142	+ CBLAS_TEST_ZOMPLEX b, CBLAS_INT ldb, double *beta,
	2143	+ CBLAS_TEST_ZOMPLEX c, CBLAS_INT ldc ) {
	2144	+ CBLAS_INT i,j,LDA,LDB,LDC;
	2145	CBLAS_TEST_ZOMPLEX A, B, *C;
	2146	CBLAS_UPLO uplo;
	2147	CBLAS_TRANSPOSE trans;
	2148	@@ -381,11 +381,11 @@ void F77_zher2k(int layout, char uplow
	2149	cblas_zher2k(UNDEFINED, uplo, trans, n, k, alpha, a, *lda,
	2150	b, ldb, beta, c, *ldc );
	2151	}
	2152	-void F77_zsyr2k(int layout, char uplow, char transp, int n, int *k,
	2153	- CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a, int *lda,
	2154	- CBLAS_TEST_ZOMPLEX b, int ldb, CBLAS_TEST_ZOMPLEX *beta,
	2155	- CBLAS_TEST_ZOMPLEX c, int ldc ) {
	2156	- int i,j,LDA,LDB,LDC;
	2157	+void F77_zsyr2k(CBLAS_INT layout, char uplow, char transp, CBLAS_INT n, CBLAS_INT *k,
	2158	+ CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a, CBLAS_INT *lda,
	2159	+ CBLAS_TEST_ZOMPLEX b, CBLAS_INT ldb, CBLAS_TEST_ZOMPLEX *beta,
	2160	+ CBLAS_TEST_ZOMPLEX c, CBLAS_INT ldc ) {
	2161	+ CBLAS_INT i,j,LDA,LDB,LDC;
	2162	CBLAS_TEST_ZOMPLEX A, B, *C;
	2163	CBLAS_UPLO uplo;
	2164	CBLAS_TRANSPOSE trans;
	2165	@@ -445,10 +445,10 @@ void F77_zsyr2k(int layout, char uplow
	2166	cblas_zsyr2k(UNDEFINED, uplo, trans, n, k, alpha, a, *lda,
	2167	b, ldb, beta, c, ldc );
	2168	}
	2169	-void F77_ztrmm(int layout, char rtlf, char uplow, char transp, char *diagn,
	2170	- int m, int n, CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a,
	2171	- int lda, CBLAS_TEST_ZOMPLEX b, int *ldb) {
	2172	- int i,j,LDA,LDB;
	2173	+void F77_ztrmm(CBLAS_INT layout, char rtlf, char uplow, char transp, char *diagn,
	2174	+ CBLAS_INT m, CBLAS_INT n, CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a,
	2175	+ CBLAS_INT lda, CBLAS_TEST_ZOMPLEX b, CBLAS_INT *ldb) {
	2176	+ CBLAS_INT i,j,LDA,LDB;
	2177	CBLAS_TEST_ZOMPLEX A, B;
	2178	CBLAS_SIDE side;
	2179	CBLAS_DIAG diag;
	2180	@@ -504,10 +504,10 @@ void F77_ztrmm(int layout, char rtlf,
	2181	a, lda, b, ldb);
	2182	}
	2183
	2184	-void F77_ztrsm(int layout, char rtlf, char uplow, char transp, char *diagn,
	2185	- int m, int n, CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a,
	2186	- int lda, CBLAS_TEST_ZOMPLEX b, int *ldb) {
	2187	- int i,j,LDA,LDB;
	2188	+void F77_ztrsm(CBLAS_INT layout, char rtlf, char uplow, char transp, char *diagn,
	2189	+ CBLAS_INT m, CBLAS_INT n, CBLAS_TEST_ZOMPLEX alpha, CBLAS_TEST_ZOMPLEX a,
	2190	+ CBLAS_INT lda, CBLAS_TEST_ZOMPLEX b, CBLAS_INT *ldb) {
	2191	+ CBLAS_INT i,j,LDA,LDB;
	2192	CBLAS_TEST_ZOMPLEX A, B;
	2193	CBLAS_SIDE side;
	2194	CBLAS_DIAG diag;

-0

debian/patches/series less more

1	1	doxygen-downsize.patch
2	2	makefile-blas-remove-dep.patch
3	3	verbose-tests.patch
	4	cblas64-test.patch