Skip to content

Commit bd4cce9

Browse files
committed
Fix the CUTEst trampoline
1 parent 8b2fb93 commit bd4cce9

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

include/cutest_routines_double.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,4 +373,3 @@
373373

374374
#define FORTRAN_open_c_r FORTRAN_open_c
375375
#define FORTRAN_close_c_r FORTRAN_close_c
376-

include/cutest_routines_quadruple.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
#define CUTEST_newthread_threadsafe_r CUTEST_newthread_threadsafe_q
213213
#define CUTEST_classification_r CUTEST_classification_q
214214
#define CUTEST_pname_r CUTEST_pname_q
215-
#define CUTEST_problem_qetup_r CUTEST_problem_qetup_q
215+
#define CUTEST_problem_setup_r CUTEST_problem_setup_q
216216
#define CUTEST_problem_terminate_r CUTEST_problem_terminate_q
217217
#define CUTEST_probname_r CUTEST_probname_q
218218
#define CUTEST_probname_threadsafe_r CUTEST_probname_threadsafe_q

src/tools/cutest_trampoline.f90

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,12 @@
3434
#endif
3535

3636
#ifdef WINDOWS
37-
#define cutest_dlopen LoadLibrary
3837
#define DLOPEN_BIND_NAME "LoadLibraryA"
39-
#define cutest_dlsym GetProcAddress
4038
#define DLSYM_BIND_NAME "GetProcAddress"
41-
#define cutest_dlclose FreeLibrary
4239
#define DLCLOSE_BIND_NAME "FreeLibrary"
4340
#else
44-
#define cutest_dlopen dlopen
4541
#define DLOPEN_BIND_NAME "dlopen"
46-
#define cutest_dlsym dlsym
4742
#define DLSYM_BIND_NAME "dlsym"
48-
#define cutest_dlclose dlclose
4943
#define DLCLOSE_BIND_NAME "dlclose"
5044
#endif
5145

@@ -59,7 +53,7 @@ function cutest_dlopen(name, mode) bind(C, name=DLOPEN_BIND_NAME)
5953
use iso_c_binding, only: c_ptr, c_int, c_char
6054
type(c_ptr) :: cutest_dlopen
6155
character(kind=c_char), dimension(*) :: name
62-
integer(kind=c_int) :: mode
56+
integer(kind=c_int), value :: mode
6357
end function cutest_dlopen
6458
end interface
6559

@@ -77,6 +71,7 @@ end function cutest_dlsym
7771
interface
7872
subroutine cutest_dlclose(handle) bind(C, name=DLCLOSE_BIND_NAME)
7973
use iso_c_binding, only: c_ptr
74+
! type(c_int) :: cutest_dlclose
8075
type(c_ptr), value :: handle
8176
end subroutine cutest_dlclose
8277
end interface

0 commit comments

Comments
 (0)