Skip to content

Commit a96a04e

Browse files
authored
Merge pull request #4493 from martin-frbg/issue4475-3
Fix incompatible pointer types in the declarations of C/ZAXPBY
2 parents e9cfb7f + 500ac4d commit a96a04e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

common_interface.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -773,8 +773,8 @@ xdouble BLASFUNC(qlamc3)(xdouble *, xdouble *);
773773

774774
void BLASFUNC(saxpby) (blasint *, float *, float *, blasint *, float *, float *, blasint *);
775775
void BLASFUNC(daxpby) (blasint *, double *, double *, blasint *, double *, double *, blasint *);
776-
void BLASFUNC(caxpby) (blasint *, float *, float *, blasint *, float *, float *, blasint *);
777-
void BLASFUNC(zaxpby) (blasint *, double *, double *, blasint *, double *, double *, blasint *);
776+
void BLASFUNC(caxpby) (blasint *, void *, float *, blasint *, void *, float *, blasint *);
777+
void BLASFUNC(zaxpby) (blasint *, void *, double *, blasint *, void *, double *, blasint *);
778778

779779
void BLASFUNC(somatcopy) (char *, char *, blasint *, blasint *, float *, float *, blasint *, float *, blasint *);
780780
void BLASFUNC(domatcopy) (char *, char *, blasint *, blasint *, double *, double *, blasint *, double *, blasint *);

interface/zaxpby.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,14 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3939

4040
#ifndef CBLAS
4141

42-
void NAME(blasint *N, FLOAT *ALPHA, FLOAT *x, blasint *INCX, FLOAT *BETA, FLOAT *y, blasint *INCY)
42+
void NAME(blasint *N, void *VALPHA, FLOAT *x, blasint *INCX, void *VBETA, FLOAT *y, blasint *INCY)
4343
{
4444

4545
blasint n = *N;
4646
blasint incx = *INCX;
4747
blasint incy = *INCY;
48+
FLOAT* ALPHA = (FLOAT*) VALPHA;
49+
FLOAT* BETA = (FLOAT*) VBETA;
4850

4951
#else
5052

0 commit comments

Comments
 (0)