Skip to content

Commit 5f70e24

Browse files
authored
Merge pull request #4894 from martin-frbg/issue4893
Fix function definition in the f2c-converted ctest and remove suppression of gcc14 error
2 parents 4850275 + 383e0b1 commit 5f70e24

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

Makefile.system

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,9 +376,6 @@ OBJCONV = $(CROSS_SUFFIX)objconv
376376
ifeq ($(NOFORTRAN), 1)
377377
C_LAPACK = 1
378378
override FEXTRALIB =
379-
ifeq ($(C_COMPILER), GCC)
380-
CCOMMON_OPT += -Wno-error=incompatible-pointer-types
381-
endif
382379
endif
383380

384381
ifeq ($(C_COMPILER), GCC)

ctest/c_zblat1c.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ static doublereal c_b43 = 1.;
380380
static integer i__;
381381
extern /* Subroutine */ int ctest_(integer*, doublecomplex*, doublecomplex*, doublecomplex*, doublereal*);
382382
static doublecomplex mwpcs[5], mwpct[5];
383-
extern /* Subroutine */ int zscaltest_(integer*, doublereal*, doublecomplex*, integer*), itest1_(integer*, integer*), stest1_(doublereal*, doublereal*, doublereal*, doublereal*);
383+
extern /* Subroutine */ int zscaltest_(integer*, doublecomplex*, doublecomplex*, integer*), itest1_(integer*, integer*), stest1_(doublereal*, doublereal*, doublereal*, doublereal*);
384384
static doublecomplex cx[8];
385385
extern doublereal dznrm2test_(integer*, doublecomplex*, integer*);
386386
static integer np1;
@@ -595,7 +595,7 @@ static doublereal c_b43 = 1.;
595595
static integer ki;
596596
extern /* Subroutine */ int zdotutest_(integer*, doublecomplex*, integer*, doublecomplex*, integer*, doublecomplex*), zswaptest_(integer*, doublecomplex*, integer*, doublecomplex*, integer*);
597597
static integer kn;
598-
extern /* Subroutine */ int zaxpytest_(integer*, doublereal*, doublecomplex*, integer*, doublecomplex*, integer*);
598+
extern /* Subroutine */ int zaxpytest_(integer*, doublecomplex*, doublecomplex*, integer*, doublecomplex*, integer*);
599599
static doublecomplex cx[7], cy[7];
600600
static integer mx, my;
601601

0 commit comments

Comments
 (0)