diff options
| author | Elena Pourmal <epourmal@hdfgroup.org> | 2001-04-29 01:08:16 (GMT) |
|---|---|---|
| committer | Elena Pourmal <epourmal@hdfgroup.org> | 2001-04-29 01:08:16 (GMT) |
| commit | 6ff2e7b303b0479bba8c4709a1fcac61fbdf9f2b (patch) | |
| tree | d652324fca55cc851875f042bc7320ce5604f7d1 | |
| parent | 2c8b1571d25f20cf8d00f346851ce3660364c149 (diff) | |
| download | hdf5-6ff2e7b303b0479bba8c4709a1fcac61fbdf9f2b.zip hdf5-6ff2e7b303b0479bba8c4709a1fcac61fbdf9f2b.tar.gz hdf5-6ff2e7b303b0479bba8c4709a1fcac61fbdf9f2b.tar.bz2 | |
[svn-r3872]
Purpose:
Windows port
Description:
Names of the H5f.c and H5ff.f90 files caused problems on Windows98.
Compilation of H5F.c (C Library) and H5Ff.f90 (Fortran library)
as compilation of H5f.c and H5ff.f90 creates the same H5F.o and H5FF.o
file names and linking stage fails.
Solution:
Rename the files to H5_f.c and H5_ff.f90
Platforms tested:
Linux (eirene) and Windows98
| -rw-r--r-- | fortran/src/H5_f.c (renamed from fortran/src/H5f.c) | 0 | ||||
| -rw-r--r-- | fortran/src/H5_ff.f90 (renamed from fortran/src/H5ff.f90) | 12 | ||||
| -rw-r--r-- | fortran/src/Makefile.in | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/fortran/src/H5f.c b/fortran/src/H5_f.c index dbd5a80..dbd5a80 100644 --- a/fortran/src/H5f.c +++ b/fortran/src/H5_f.c diff --git a/fortran/src/H5ff.f90 b/fortran/src/H5_ff.f90 index f9b6a22..642bf40 100644 --- a/fortran/src/H5ff.f90 +++ b/fortran/src/H5_ff.f90 @@ -22,6 +22,12 @@ ! Comment: !---------------------------------------------------------------------- SUBROUTINE h5open_f(error) +! +!This definition is needed for Windows DLLs +!DEC$if defined(BUILD_HDF5_DLL) +!DEC$attributes dllexport :: h5open_f +!DEC$endif +! USE H5GLOBAL IMPLICIT NONE @@ -114,6 +120,12 @@ !---------------------------------------------------------------------- SUBROUTINE h5close_f(error) +! +!This definition is needed for Windows DLLs +!DEC$if defined(BUILD_HDF5_DLL) +!DEC$attributes dllexport :: h5close_f +!DEC$endif +! USE H5GLOBAL IMPLICIT NONE diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index e37cd08..810c00f 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -27,11 +27,11 @@ ADD_PARALLEL_FILES=@ADD_PARALLEL_FILES@ FPAR_MOD=${ADD_PARALLEL_FILES:yes=HDF5mpio.f90} CPARALLEL=${ADD_PARALLEL_FILES:yes=H5FDmpiof.c} -CLIB_SRC=H5f90kit.c H5f.c H5Git.c H5Rf.c H5Ff.c H5Sf.c H5Df.c H5Gf.c \ +CLIB_SRC=H5f90kit.c H5_f.c H5Git.c H5Rf.c H5Ff.c H5Sf.c H5Df.c H5Gf.c \ H5Af.c H5Tf.c H5Pf.c H5If.c H5Ef.c ${CPARALLEL:no=} FPARALLEL=${ADD_PARALLEL_FILES:yes=H5FDmpioff.f90} -FLIB_SRC=H5fortran_types.f90 H5fortran_flags.f90 H5f90global.f90 H5ff.f90 \ +FLIB_SRC=H5fortran_types.f90 H5fortran_flags.f90 H5f90global.f90 H5_ff.f90 \ H5Rff.f90 H5Fff.f90 H5Sff.f90 H5Dff.f90 H5Gff.f90 H5Aff.f90 H5Tff.f90 \ H5Pff.f90 H5Iff.f90 H5Eff.f90 ${FPARALLEL:no=} ${FPAR_MOD:no=HDF5.f90} |