Skip to content

Commit 75a9960

Browse files
authored
Merge pull request #5744 from nakatamaho/fix/slamc3
lapack/laed3: fix MinGW build by matching LAMC3 prototype
2 parents 9d9fcc1 + f272216 commit 75a9960

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

lapack/laed3/laed3_parallel.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3333
#include <stdio.h>
3434
#include "common.h"
3535

36+
#ifdef max
37+
#undef max
38+
#endif
3639
#define max(a,b) ((a) > (b) ? (a) : (b))
3740
#define copysign(x,y) ((y) < 0 ? ((x) < 0 ? (x) : -(x)) : ((x) < 0 ? -(x) : (x)))
3841

@@ -54,7 +57,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5457
#define LASET BLASFUNC(slaset)
5558
#endif
5659

57-
FLOAT LAMC3(FLOAT *, FLOAT *);
60+
FLOATRET LAMC3(FLOAT *, FLOAT *);
5861
void LAED4(blasint *, blasint *, FLOAT *, FLOAT *, FLOAT *, FLOAT *, FLOAT *, blasint *);
5962
void LACPY(char *, blasint *, blasint *, FLOAT *, blasint *, FLOAT *, blasint *);
6063
void LASET(char *, blasint *, blasint *, FLOAT *, FLOAT *, FLOAT *, blasint *);

lapack/laed3/laed3_single.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5353
#define LASET BLASFUNC(slaset)
5454
#endif
5555

56-
FLOAT LAMC3(FLOAT *, FLOAT *);
56+
FLOATRET LAMC3(FLOAT *, FLOAT *);
5757
void LAED4(blasint *, blasint *, FLOAT *, FLOAT *, FLOAT *, FLOAT *, FLOAT *, blasint *);
5858
void LACPY(char *, blasint *, blasint *, FLOAT *, blasint *, FLOAT *, blasint *);
5959
void LASET(char *, blasint *, blasint *, FLOAT *, FLOAT *, FLOAT *, blasint *);

0 commit comments

Comments
 (0)