From 12684acfd4496b16227f59edea5540fe0e645104 Mon Sep 17 00:00:00 2001 From: hadaq Date: Fri, 16 Apr 2010 15:00:32 +0000 Subject: [PATCH] Incompatible types for 64-bit arch fixed. Sergey --- ebctrl/ioc/ebctrlApp/src/genSubRecord.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ebctrl/ioc/ebctrlApp/src/genSubRecord.c b/ebctrl/ioc/ebctrlApp/src/genSubRecord.c index 4b5583c..23768b6 100755 --- a/ebctrl/ioc/ebctrlApp/src/genSubRecord.c +++ b/ebctrl/ioc/ebctrlApp/src/genSubRecord.c @@ -130,8 +130,8 @@ static long init_record( genSubRecord *pgsub, int pass ) unsigned short *typptr; void **valptr; void **ovlptr; - unsigned long *nelptr; - unsigned long *totptr; + epicsUInt32 *nelptr; + epicsUInt32 *totptr; unsigned long num; struct link *plinkin; struct link *plinkout; @@ -187,6 +187,7 @@ static long init_record( genSubRecord *pgsub, int pass ) num = (*nelptr)*(*totptr); if( num > MAX_ARRAY_SIZE ) { + printf("1\n"); printf("Link %s - Array too large! %ld Bytes\n", fldnames[i], num); status = S_db_errArg; } @@ -210,6 +211,7 @@ static long init_record( genSubRecord *pgsub, int pass ) num = (*nelptr)*MAX_STRING_SIZE; if( num > MAX_ARRAY_SIZE ) { + printf("2\n"); printf("Link %s - Array too large! %ld Bytes\n", fldnames[i], num); status = S_db_errArg; } @@ -231,6 +233,7 @@ static long init_record( genSubRecord *pgsub, int pass ) num = (*nelptr)*sizeofTypes[*typptr]; if( num > MAX_ARRAY_SIZE ) { + printf("3\n"); printf("Link %s - Array too large! %ld Bytes\n", fldnames[i], num); status = S_db_errArg; } @@ -436,7 +439,7 @@ static long process( genSubRecord *pgsub ) struct link *plinkin; struct link *plinkout; unsigned short *typptr; - unsigned long *nelptr; + epicsUInt32 *nelptr; long nRequest; long options; void **valptr; @@ -589,7 +592,7 @@ static void monitor( genSubRecord *pgsub, int reset ) { int i; unsigned short monitor_mask; - unsigned long *totptr; + epicsUInt32 *totptr; void **valptr; void **ovlptr; -- 2.43.0