diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-04-04 21:17:51 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-04-04 21:17:51 (GMT) |
| commit | b296a419c4ed2cc43cab53b78a40cbf1346f2362 (patch) | |
| tree | 7a652352898be1a2e963c9e700228c00a878657d /fortran/test | |
| parent | 7f5e1dfe31696bddb3967865af52801a2b38bb7e (diff) | |
| download | hdf5-b296a419c4ed2cc43cab53b78a40cbf1346f2362.zip hdf5-b296a419c4ed2cc43cab53b78a40cbf1346f2362.tar.gz hdf5-b296a419c4ed2cc43cab53b78a40cbf1346f2362.tar.bz2 | |
[svn-r10534] Purpose:
Configuration feature
Description:
Different Fortran compilers mangle function names in different ways
(upper case, lower case, adding underscores). To link between
Fortran and C functions, we need to know what a given function's
name is under a given compiler.
Solution:
Use autoconf's FC_WRAPPERS check to determine the Fortran
naming scheme and define the FC_FUNC_ macro to name our
functions (in H5f90proto.h). Removed references to
our old FNAME macro, as well as flags that indicated whether
function names were upper or lower case.
Platforms tested:
mir, pommier, modi4, copper, more
Diffstat (limited to 'fortran/test')
| -rw-r--r-- | fortran/test/Makefile.in | 1 | ||||
| -rw-r--r-- | fortran/test/t.h | 12 |
2 files changed, 4 insertions, 9 deletions
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 980cfc4..04f1c2b 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -196,6 +196,7 @@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ FCFLAGS = @FCFLAGS@ +FCLIBS = @FCLIBS@ FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FSEARCH_DIRS = @FSEARCH_DIRS@ diff --git a/fortran/test/t.h b/fortran/test/t.h index 0286028..3e4fd4d 100644 --- a/fortran/test/t.h +++ b/fortran/test/t.h @@ -21,15 +21,9 @@ char *h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size) /* * Functions from t.c */ -#ifdef DF_CAPFNAMES -# define nh5_fixname_c FNAME(H5_FIXNAME_C) -# define nh5_cleanup_c FNAME(H5_CLEANUP_C) -# define nh5_exit_c FNAME(H5_EXIT_C) -#else /* !DF_CAPFNAMES */ -# define nh5_fixname_c FNAME(h5_fixname_c) -# define nh5_cleanup_c FNAME(h5_cleanup_c) -# define nh5_exit_c FNAME(h5_exit_c) -#endif /* DF_CAPFNAMES */ +# define nh5_fixname_c FC_FUNC_(h5_fixname_c, H5_FIXNAME_C) +# define nh5_cleanup_c FC_FUNC_(h5_cleanup_c, H5_CLEANUP_C) +# define nh5_exit_c FC_FUNC_(h5_exit_c, H5_EXIT_C) H5_FCTESTDLL int_f nh5_fixname_c (_fcd base_name, size_t_f *base_namelen, hid_t_f *fapl, _fcd full_name, size_t_f *full_namelen); |