mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-24 17:51:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r10534] Purpose:

Browse Source 
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
This commit is contained in:
James Laird 2005-04-04 16:17:51 -05:00
parent 7f5e1dfe31
commit b296a419c4
58 changed files with 4141 additions and 922 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -165,6 +165,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
c++/Makefile.in
View File

@ -135,6 +135,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
c++/examples/Makefile.in
View File

@ -127,6 +127,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
c++/src/Makefile.in
View File

@ -169,6 +169,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
c++/test/Makefile.in
View File

@ -158,6 +158,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

3771
configure vendored
View File

File diff suppressed because it is too large Load Diff

23
configure.in
View File

@ -311,19 +311,24 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
dnl Change to the Fortran 90 language dnl Change to the Fortran 90 language
AC_LANG_PUSH(Fortran) AC_LANG_PUSH(Fortran)
dnl --------------------------------------------------------------------
dnl Define wrappers for the C compiler to use Fortran function names
dnl
AC_FC_WRAPPERS
dnl -------------------------------------------------------------------- dnl --------------------------------------------------------------------
dnl See if the compiler will support the "-I." option dnl See if the compiler will support the "-I." option
dnl dnl
FCFLAGS_saved=$FCFLAGS dnl FCFLAGS_saved=$FCFLAGS
FCFLAGS="${FCFLAGS} -I." dnl FCFLAGS="${FCFLAGS} -I."
AC_MSG_CHECKING(if compiler supports -I. option) dnl AC_MSG_CHECKING(if compiler supports -I. option)
AC_TRY_FCOMPILE([ dnl AC_TRY_FCOMPILE([
program conftest dnl program conftest
end dnl end
], AC_MSG_RESULT(yes), dnl ], AC_MSG_RESULT(yes),
AC_MSG_RESULT(no) dnl AC_MSG_RESULT(no)
FCFLAGS="$FCFLAGS_saved") dnl FCFLAGS="$FCFLAGS_saved")
dnl Change back to the C language dnl Change back to the C language
AC_LANG_POP(Fortran) AC_LANG_POP(Fortran)

1
doc/Makefile.in
View File

@ -132,6 +132,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
doc/html/ADGuide/Makefile.in
View File

@ -129,6 +129,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
doc/html/Graphics/Makefile.in
View File

@ -129,6 +129,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
doc/html/Intro/Makefile.in
View File

@ -129,6 +129,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
doc/html/Makefile.in
View File

@ -142,6 +142,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
doc/html/PSandPDF/Makefile.in
View File

@ -119,6 +119,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
doc/html/TechNotes/Makefile.in
View File

@ -129,6 +129,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
doc/html/Tutor/Graphics/Makefile.in
View File

@ -129,6 +129,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
doc/html/Tutor/Makefile.in
View File

@ -138,6 +138,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
doc/html/Tutor/examples/Makefile.in
View File

@ -131,6 +131,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
doc/html/cpplus/Makefile.in
View File

@ -129,6 +129,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
doc/html/ed_libs/Makefile.in
View File

@ -129,6 +129,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
doc/html/ed_styles/Makefile.in
View File

@ -129,6 +129,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
doc/html/fortran/Makefile.in
View File

@ -129,6 +129,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
examples/Makefile.in
View File

@ -127,6 +127,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
fortran/Makefile.in
View File

@ -139,6 +139,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
fortran/examples/Makefile.in
View File

@ -127,6 +127,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

43
fortran/src/H5f90i.h
View File

@ -34,8 +34,6 @@ typedef long size_t_f;
typedef long int_f; typedef long int_f;
typedef long hid_t_f; typedef long hid_t_f;
typedef double real_f; typedef double real_f;
#define DF_CAPFNAMES
/*#define _fcdtocp(desc) (desc)*/
#endif /* UNICOS */ #endif /* UNICOS */
@ -62,10 +60,6 @@ typedef int size_t_f;
typedef int int_f; typedef int int_f;
typedef int hid_t_f; typedef int hid_t_f;
typedef float real_f; typedef float real_f;
#define FNAME(x) x
#if defined H5_ABSOFT
#define DF_CAPFNAMES
#endif /*H5_ABSOFT*/
#define _fcdtocp(desc) (desc) #define _fcdtocp(desc) (desc)
#endif /*APPLE*/ #endif /*APPLE*/
@ -87,11 +81,6 @@ typedef long long haddr_t_f;
typedef long long hsize_t_f; typedef long long hsize_t_f;
typedef long long hssize_t_f; typedef long long hssize_t_f;
typedef int size_t_f; typedef int size_t_f;
#if defined H5_ABSOFT
#define DF_CAPFNAMES
#else
#define FNAME_POST_UNDERSCORE
#endif /*H5_ABSOFT*/
/* AMD64 specific definitions */ /* AMD64 specific definitions */
#elif defined __x86_64__ #elif defined __x86_64__
@ -100,7 +89,6 @@ typedef long long haddr_t_f;
typedef long long hsize_t_f; typedef long long hsize_t_f;
typedef long long hssize_t_f; typedef long long hssize_t_f;
typedef int size_t_f; typedef int size_t_f;
#define FNAME_POST_UNDERSCORE
/* IA64 specific definitions */ /* IA64 specific definitions */
#elif defined __ia64 #elif defined __ia64
@ -109,7 +97,6 @@ typedef long haddr_t_f;
typedef long hsize_t_f; typedef long hsize_t_f;
typedef long hssize_t_f; typedef long hssize_t_f;
typedef long size_t_f; typedef long size_t_f;
#define FNAME_POST_UNDERSCORE
#endif /* IA64 */ #endif /* IA64 */
#endif /* LINUX*/ #endif /* LINUX*/
@ -124,7 +111,6 @@ typedef long size_t_f;
typedef int int_f; typedef int int_f;
typedef int hid_t_f; typedef int hid_t_f;
typedef float real_f; typedef float real_f;
#define FNAME_POST_UNDERSCORE
#define _fcdtocp(desc) (desc) #define _fcdtocp(desc) (desc)
#endif /* IRIX */ #endif /* IRIX */
@ -138,7 +124,6 @@ typedef int size_t_f;
typedef int int_f; typedef int int_f;
typedef int hid_t_f; typedef int hid_t_f;
typedef float real_f; typedef float real_f;
#define FNAME_POST_UNDERSCORE
#define _fcdtocp(desc) (desc) #define _fcdtocp(desc) (desc)
#endif /*SUN*/ #endif /*SUN*/
@ -153,7 +138,6 @@ typedef long size_t_f;
typedef int int_f; typedef int int_f;
typedef int hid_t_f; typedef int hid_t_f;
typedef float real_f; typedef float real_f;
#define FNAME_POST_UNDERSCORE
#define _fcdtocp(desc) (desc) #define _fcdtocp(desc) (desc)
#endif /* DEC_ALPHA */ #endif /* DEC_ALPHA */
@ -168,7 +152,6 @@ typedef long long size_t_f;
typedef int int_f; typedef int int_f;
typedef int hid_t_f; typedef int hid_t_f;
typedef float real_f; typedef float real_f;
#define FNAME_POST2_UNDERSCORE
#define _fcdtocp(desc) (desc) #define _fcdtocp(desc) (desc)
#endif /* DEC_ALPHA_LINUX */ #endif /* DEC_ALPHA_LINUX */
@ -199,7 +182,6 @@ typedef int int_f;
typedef int hid_t_f; typedef int hid_t_f;
typedef float real_f; typedef float real_f;
#define DF_CAPFNAMES
#define _fcdtocp(desc) (desc) #define _fcdtocp(desc) (desc)
#endif /*WINDOWS */ #endif /*WINDOWS */
@ -234,32 +216,7 @@ typedef long hssize_t_f;
typedef long size_t_f; typedef long size_t_f;
#endif /* IA64 */ #endif /* IA64 */
#define FNAME_POST_UNDERSCORE
#endif /* FreeBSD */ #endif /* FreeBSD */
/*----------------------------------------------------------------
** MACRO FNAME for any fortran callable routine name.
**
** This macro prepends, appends, or does not modify a name
** passed as a macro parameter to it based on the FNAME_PRE_UNDERSCORE,
** FNAME_POST_UNDERSCORE macros set for a specific system.
**
**---------------------------------------------------------------*/
#if defined(FNAME_PRE_UNDERSCORE) && defined(FNAME_POST_UNDERSCORE)
# define FNAME(x) _##x##_
#endif
#if defined(FNAME_PRE_UNDERSCORE) && !defined(FNAME_POST_UNDERSCORE)
# define FNAME(x) _##x
#endif
#if !defined(FNAME_PRE_UNDERSCORE) && defined(FNAME_POST_UNDERSCORE)
# define FNAME(x) x##_
#endif
#if !defined(FNAME_PRE_UNDERSCORE) && !defined(FNAME_POST_UNDERSCORE)
# define FNAME(x) x
#endif
#if !defined(FNAME_PRE_UNDERSCORE) && defined(FNAME_POST2_UNDERSCORE)
# define FNAME(x) x##__
#endif
#endif /* _H5f90i_H */ #endif /* _H5f90i_H */

950
fortran/src/H5f90proto.h
View File

File diff suppressed because it is too large Load Diff

2
fortran/src/Makefile.am
View File

@ -24,6 +24,8 @@ include $(top_srcdir)/config/commence.am
INCLUDES = -I$(top_srcdir)/src INCLUDES = -I$(top_srcdir)/src
AM_FCFLAGS=-I$(top_srcdir)/src AM_FCFLAGS=-I$(top_srcdir)/src
AM_FCLIBS=$(LIBHDF5)
# Fortran libraries are linked statically to solve a build problem. # Fortran libraries are linked statically to solve a build problem.
AM_LDFLAGS=-static AM_LDFLAGS=-static

2
fortran/src/Makefile.in
View File

@ -179,6 +179,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@
@ -331,6 +332,7 @@ H5FC_PP = $(bindir)/h5pfc
# for linking) # for linking)
INCLUDES = -I$(top_srcdir)/src INCLUDES = -I$(top_srcdir)/src
AM_FCFLAGS = -I$(top_srcdir)/src AM_FCFLAGS = -I$(top_srcdir)/src
AM_FCLIBS = $(LIBHDF5)
# Fortran libraries are linked statically to solve a build problem. # Fortran libraries are linked statically to solve a build problem.
AM_LDFLAGS = -static AM_LDFLAGS = -static

1
fortran/test/Makefile.in
View File

@ -196,6 +196,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

12
fortran/test/t.h
View File

@ -21,15 +21,9 @@ char *h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size)
/* /*
* Functions from t.c * Functions from t.c
*/ */
#ifdef DF_CAPFNAMES # define nh5_fixname_c FC_FUNC_(h5_fixname_c, H5_FIXNAME_C)
# define nh5_fixname_c FNAME(H5_FIXNAME_C) # define nh5_cleanup_c FC_FUNC_(h5_cleanup_c, H5_CLEANUP_C)
# define nh5_cleanup_c FNAME(H5_CLEANUP_C) # define nh5_exit_c FC_FUNC_(h5_exit_c, H5_EXIT_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 */
H5_FCTESTDLL int_f nh5_fixname_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); (_fcd base_name, size_t_f *base_namelen, hid_t_f *fapl, _fcd full_name, size_t_f *full_namelen);

1
fortran/testpar/Makefile.in
View File

@ -151,6 +151,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
hl/Makefile.in
View File

@ -131,6 +131,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
hl/c++/Makefile.in
View File

@ -136,6 +136,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
hl/c++/src/Makefile.in
View File

@ -158,6 +158,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
hl/c++/test/Makefile.in
View File

@ -152,6 +152,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
hl/fortran/Makefile.in
View File

@ -131,6 +131,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

153
hl/fortran/src/H5LTf90proto.h
View File

@ -16,6 +16,7 @@
#ifndef _H5LTf90proto_H #ifndef _H5LTf90proto_H
#define _H5LTf90proto_H #define _H5LTf90proto_H
#include "H5config.h"
#include "H5f90i.h" #include "H5f90i.h"
H5_DLL char* HD5f2cstring (_fcd fdesc, int len); H5_DLL char* HD5f2cstring (_fcd fdesc, int len);
@ -25,134 +26,58 @@ H5_DLL void HD5packFstring (char *src, char *dest, size_t len);
/* /*
* Functions from H5LTfc.c * Functions from H5LTfc.c
*/ */
#ifndef H5Ff90_FNAMES # define nh5ltmake_dataset_c FC_FUNC_(h5ltmake_dataset_c, H5LTMAKE_DATASET_C)
# define H5Ff90_FNAMES # define nh5ltread_dataset_c FC_FUNC_(h5ltread_dataset_c, H5LTREAD_DATASET_C)
#ifdef DF_CAPFNAMES # define nh5ltmake_dataset_string_c FC_FUNC_(h5ltmake_dataset_string_c, H5LTMAKE_DATASET_STRING_C)
# define nh5ltmake_dataset_c FNAME(H5LTMAKE_DATASET_C) # define nh5ltread_dataset_string_c FC_FUNC_(h5ltread_dataset_string_c, H5LTREAD_DATASET_STRING_C)
# define nh5ltread_dataset_c FNAME(H5LTREAD_DATASET_C)
# define nh5ltmake_dataset_string_c FNAME(H5LTMAKE_DATASET_STRING_C)
# define nh5ltread_dataset_string_c FNAME(H5LTREAD_DATASET_STRING_C)
# define nh5ltset_attribute_int_c FC_FUNC_(h5ltset_attribute_int_c, H5LTSET_ATTRIBUTE_INT_C)
# define nh5ltset_attribute_float_c FC_FUNC_(h5ltset_attribute_float_c, H5LTSET_ATTRIBUTE_FLOAT_C)
# define nh5ltset_attribute_double_c FC_FUNC_(h5ltset_attribute_double_c, H5LTSET_ATTRIBUTE_DOUBLE_C)
# define nh5ltset_attribute_string_c FC_FUNC_(h5ltset_attribute_string_c, H5LTSET_ATTRIBUTE_STRING_C)
# define nh5ltset_attribute_int_c FNAME(H5LTSET_ATTRIBUTE_INT_C) # define nh5ltget_attribute_int_c FC_FUNC_(h5ltget_attribute_int_c, H5LTGET_ATTRIBUTE_INT_C)
# define nh5ltset_attribute_float_c FNAME(H5LTSET_ATTRIBUTE_FLOAT_C) # define nh5ltget_attribute_float_c FC_FUNC_(h5ltget_attribute_float_c, H5LTGET_ATTRIBUTE_FLOAT_C)
# define nh5ltset_attribute_double_c FNAME(H5LTSET_ATTRIBUTE_DOUBLE_C) # define nh5ltget_attribute_double_c FC_FUNC_(h5ltget_attribute_double_c, H5LTGET_ATTRIBUTE_DOUBLE_C)
# define nh5ltset_attribute_string_c FNAME(H5LTSET_ATTRIBUTE_STRING_C) # define nh5ltget_attribute_string_c FC_FUNC_(h5ltget_attribute_string_c, H5LTGET_ATTRIBUTE_STRING_C)
# define nh5ltget_attribute_int_c FNAME(H5LTGET_ATTRIBUTE_INT_C) # define nh5ltget_dataset_ndims_c FC_FUNC_(h5ltget_dataset_ndims_c, H5LTGET_DATASET_NDIMS_C)
# define nh5ltget_attribute_float_c FNAME(H5LTGET_ATTRIBUTE_FLOAT_C) # define nh5ltfind_dataset_c FC_FUNC_(h5ltfind_dataset_c, H5LTFIND_DATASET_C)
# define nh5ltget_attribute_double_c FNAME(H5LTGET_ATTRIBUTE_DOUBLE_C) # define nh5ltget_dataset_info_c FC_FUNC_(h5ltget_dataset_info_c, H5LTGET_DATASET_INFO_C)
# define nh5ltget_attribute_string_c FNAME(H5LTGET_ATTRIBUTE_STRING_C)
# define nh5ltget_dataset_ndims_c FNAME(H5LTGET_DATASET_NDIMS_C) # define nh5ltget_attribute_ndims_c FC_FUNC_(h5ltget_attribute_ndims_c, H5LTGET_ATTRIBUTE_NDIMS_C)
# define nh5ltfind_dataset_c FNAME(H5LTFIND_DATASET_C) # define nh5ltget_attribute_info_c FC_FUNC_(h5ltget_attribute_info_c, H5LTGET_ATTRIBUTE_INFO_C)
# define nh5ltget_dataset_info_c FNAME(H5LTGET_DATASET_INFO_C)
# define nh5ltget_attribute_ndims_c FNAME(H5LTGET_ATTRIBUTE_NDIMS_C)
# define nh5ltget_attribute_info_c FNAME(H5LTGET_ATTRIBUTE_INFO_C)
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Image * Image
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
# define nh5immake_image_8bit_c FNAME(H5IMMAKE_IMAGE_8BIT_C) # define nh5immake_image_8bit_c FC_FUNC_(h5immake_image_8bit_c, H5IMMAKE_IMAGE_8BIT_C)
# define nh5immake_image_24bit_c FNAME(H5IMMAKE_IMAGE_24BIT_C) # define nh5immake_image_24bit_c FC_FUNC_(h5immake_image_24bit_c, H5IMMAKE_IMAGE_24BIT_C)
# define nh5imread_image_c FNAME(H5IMREAD_IMAGE_C) # define nh5imread_image_c FC_FUNC_(h5imread_image_c, H5IMREAD_IMAGE_C)
# define nh5imget_image_info_c FNAME(H5IMGET_IMAGE_INFO_C) # define nh5imget_image_info_c FC_FUNC_(h5imget_image_info_c, H5IMGET_IMAGE_INFO_C)
# define nh5imis_image_c FNAME(H5IMIS_IMAGE_C) # define nh5imis_image_c FC_FUNC_(h5imis_image_c, H5IMIS_IMAGE_C)
# define nh5immake_palette_c FNAME(H5IMMAKE_PALETTE_C) # define nh5immake_palette_c FC_FUNC_(h5immake_palette_c, H5IMMAKE_PALETTE_C)
# define nh5imlink_palette_c FNAME(H5IMLINK_PALETTE_C) # define nh5imlink_palette_c FC_FUNC_(h5imlink_palette_c, H5IMLINK_PALETTE_C)
# define nh5imunlink_palette_c FNAME(H5IMUNLINK_PALETTE_C) # define nh5imunlink_palette_c FC_FUNC_(h5imunlink_palette_c, H5IMUNLINK_PALETTE_C)
# define nh5imget_npalettes_c FNAME(H5IMGET_NPALETTES_C) # define nh5imget_npalettes_c FC_FUNC_(h5imget_npalettes_c, H5IMGET_NPALETTES_C)
# define nh5imget_palette_info_c FNAME(H5IMGET_PALETTE_INFO_C) # define nh5imget_palette_info_c FC_FUNC_(h5imget_palette_info_c, H5IMGET_PALETTE_INFO_C)
# define nh5imget_palette_c FNAME(H5IMGET_PALETTE_C) # define nh5imget_palette_c FC_FUNC_(h5imget_palette_c, H5IMGET_PALETTE_C)
# define nh5imis_palette_c FNAME(H5IMIS_PALETTE_C) # define nh5imis_palette_c FC_FUNC_(h5imis_palette_c, H5IMIS_PALETTE_C)
/*-------------------------------------------------------------------------
* Table
*-------------------------------------------------------------------------
*/
# define nh5tbmake_table_c FNAME(H5TBMAKE_TABLE_C)
# define nh5tbwrite_field_name_c FNAME(H5TBWRITE_FIELD_NAME_C)
# define nh5tbread_field_name_c FNAME(H5TBREAD_FIELD_NAME_C)
# define nh5tbwrite_field_index_c FNAME(H5TBWRITE_FIELD_INDEX_C)
# define nh5tbread_field_index_c FNAME(H5TBREAD_FIELD_INDEX_C)
# define nh5tbinsert_field_c FNAME(H5TBINSERT_FIELD_C)
# define nh5tbdelete_field_c FNAME(H5TBDELETE_FIELD_C)
# define nh5tbget_table_info_c FNAME(H5TBGET_TABLE_INFO_C)
# define nh5tbget_field_info_c FNAME(H5TBGET_FIELD_INFO_C)
#else /* !DF_CAPFNAMES */
# define nh5ltmake_dataset_c FNAME(h5ltmake_dataset_c)
# define nh5ltread_dataset_c FNAME(h5ltread_dataset_c)
# define nh5ltmake_dataset_string_c FNAME(h5ltmake_dataset_string_c)
# define nh5ltread_dataset_string_c FNAME(h5ltread_dataset_string_c)
# define nh5ltset_attribute_int_c FNAME(h5ltset_attribute_int_c)
# define nh5ltset_attribute_float_c FNAME(h5ltset_attribute_float_c)
# define nh5ltset_attribute_double_c FNAME(h5ltset_attribute_double_c)
# define nh5ltset_attribute_string_c FNAME(h5ltset_attribute_string_c)
# define nh5ltget_attribute_int_c FNAME(h5ltget_attribute_int_c)
# define nh5ltget_attribute_float_c FNAME(h5ltget_attribute_float_c)
# define nh5ltget_attribute_double_c FNAME(h5ltget_attribute_double_c)
# define nh5ltget_attribute_string_c FNAME(h5ltget_attribute_string_c)
# define nh5ltget_dataset_ndims_c FNAME(h5ltget_dataset_ndims_c)
# define nh5ltfind_dataset_c FNAME(h5ltfind_dataset_c)
# define nh5ltget_dataset_info_c FNAME(h5ltget_dataset_info_c)
# define nh5ltget_attribute_ndims_c FNAME(h5ltget_attribute_ndims_c)
# define nh5ltget_attribute_info_c FNAME(h5ltget_attribute_info_c)
/*-------------------------------------------------------------------------
* Image
*-------------------------------------------------------------------------
*/
# define nh5immake_image_8bit_c FNAME(h5immake_image_8bit_c)
# define nh5immake_image_24bit_c FNAME(h5immake_image_24bit_c)
# define nh5imread_image_c FNAME(h5imread_image_c)
# define nh5imget_image_info_c FNAME(h5imget_image_info_c)
# define nh5imis_image_c FNAME(h5imis_image_c)
# define nh5immake_palette_c FNAME(h5immake_palette_c)
# define nh5imlink_palette_c FNAME(h5imlink_palette_c)
# define nh5imunlink_palette_c FNAME(h5imunlink_palette_c)
# define nh5imget_npalettes_c FNAME(h5imget_npalettes_c)
# define nh5imget_palette_info_c FNAME(h5imget_palette_info_c)
# define nh5imget_palette_c FNAME(h5imget_palette_c)
# define nh5imis_palette_c FNAME(h5imis_palette_c)
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Table * Table
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
# define nh5tbmake_table_c FNAME(h5tbmake_table_c) # define nh5tbmake_table_c FC_FUNC_(h5tbmake_table_c, H5TBMAKE_TABLE_C)
# define nh5tbwrite_field_name_c FNAME(h5tbwrite_field_name_c) # define nh5tbwrite_field_name_c FC_FUNC_(h5tbwrite_field_name_c, H5TBWRITE_FIELD_NAME_C)
# define nh5tbread_field_name_c FNAME(h5tbread_field_name_c) # define nh5tbread_field_name_c FC_FUNC_(h5tbread_field_name_c, H5TBREAD_FIELD_NAME_C)
# define nh5tbwrite_field_index_c FNAME(h5tbwrite_field_index_c) # define nh5tbwrite_field_index_c FC_FUNC_(h5tbwrite_field_index_c, H5TBWRITE_FIELD_INDEX_C)
# define nh5tbread_field_index_c FNAME(h5tbread_field_index_c) # define nh5tbread_field_index_c FC_FUNC_(h5tbread_field_index_c, H5TBREAD_FIELD_INDEX_C)
# define nh5tbinsert_field_c FNAME(h5tbinsert_field_c) # define nh5tbinsert_field_c FC_FUNC_(h5tbinsert_field_c, H5TBINSERT_FIELD_C)
# define nh5tbdelete_field_c FNAME(h5tbdelete_field_c) # define nh5tbdelete_field_c FC_FUNC_(h5tbdelete_field_c, H5TBDELETE_FIELD_C)
# define nh5tbget_table_info_c FNAME(h5tbget_table_info_c) # define nh5tbget_table_info_c FC_FUNC_(h5tbget_table_info_c, H5TBGET_TABLE_INFO_C)
# define nh5tbget_field_info_c FNAME(h5tbget_field_info_c) # define nh5tbget_field_info_c FC_FUNC_(h5tbget_field_info_c, H5TBGET_FIELD_INFO_C)
#endif /* DF_CAPFNAMES */
#endif /* H5Ff90_FNAMES */
H5_DLL H5_DLL
int_f int_f

45
hl/fortran/src/H5f90i.h
View File

@ -20,6 +20,8 @@
* Standard header files needed all the time * Standard header files needed all the time
*/ */
#include "H5private.h"
#if (defined (UNICOS) || (defined (_UNICOS))) #if (defined (UNICOS) || (defined (_UNICOS)))
#include <fortran.h> #include <fortran.h>
@ -32,8 +34,6 @@ typedef long size_t_f;
typedef long int_f; typedef long int_f;
typedef long hid_t_f; typedef long hid_t_f;
typedef double real_f; typedef double real_f;
#define DF_CAPFNAMES
/*#define _fcdtocp(desc) (desc)*/
#endif /* UNICOS */ #endif /* UNICOS */
@ -60,10 +60,6 @@ typedef int size_t_f;
typedef int int_f; typedef int int_f;
typedef int hid_t_f; typedef int hid_t_f;
typedef float real_f; typedef float real_f;
#define FNAME(x) x
#if defined H5_ABSOFT
#define DF_CAPFNAMES
#endif /*H5_ABSOFT*/
#define _fcdtocp(desc) (desc) #define _fcdtocp(desc) (desc)
#endif /*APPLE*/ #endif /*APPLE*/
@ -85,11 +81,6 @@ typedef long long haddr_t_f;
typedef long long hsize_t_f; typedef long long hsize_t_f;
typedef long long hssize_t_f; typedef long long hssize_t_f;
typedef int size_t_f; typedef int size_t_f;
#if defined H5_ABSOFT
#define DF_CAPFNAMES
#else
#define FNAME_POST_UNDERSCORE
#endif /*H5_ABSOFT*/
/* AMD64 specific definitions */ /* AMD64 specific definitions */
#elif defined __x86_64__ #elif defined __x86_64__
@ -98,7 +89,6 @@ typedef long long haddr_t_f;
typedef long long hsize_t_f; typedef long long hsize_t_f;
typedef long long hssize_t_f; typedef long long hssize_t_f;
typedef int size_t_f; typedef int size_t_f;
#define FNAME_POST_UNDERSCORE
/* IA64 specific definitions */ /* IA64 specific definitions */
#elif defined __ia64 #elif defined __ia64
@ -107,7 +97,6 @@ typedef long haddr_t_f;
typedef long hsize_t_f; typedef long hsize_t_f;
typedef long hssize_t_f; typedef long hssize_t_f;
typedef long size_t_f; typedef long size_t_f;
#define FNAME_POST_UNDERSCORE
#endif /* IA64 */ #endif /* IA64 */
#endif /* LINUX*/ #endif /* LINUX*/
@ -122,7 +111,6 @@ typedef long size_t_f;
typedef int int_f; typedef int int_f;
typedef int hid_t_f; typedef int hid_t_f;
typedef float real_f; typedef float real_f;
#define FNAME_POST_UNDERSCORE
#define _fcdtocp(desc) (desc) #define _fcdtocp(desc) (desc)
#endif /* IRIX */ #endif /* IRIX */
@ -136,7 +124,6 @@ typedef int size_t_f;
typedef int int_f; typedef int int_f;
typedef int hid_t_f; typedef int hid_t_f;
typedef float real_f; typedef float real_f;
#define FNAME_POST_UNDERSCORE
#define _fcdtocp(desc) (desc) #define _fcdtocp(desc) (desc)
#endif /*SUN*/ #endif /*SUN*/
@ -151,7 +138,6 @@ typedef long size_t_f;
typedef int int_f; typedef int int_f;
typedef int hid_t_f; typedef int hid_t_f;
typedef float real_f; typedef float real_f;
#define FNAME_POST_UNDERSCORE
#define _fcdtocp(desc) (desc) #define _fcdtocp(desc) (desc)
#endif /* DEC_ALPHA */ #endif /* DEC_ALPHA */
@ -166,7 +152,6 @@ typedef long long size_t_f;
typedef int int_f; typedef int int_f;
typedef int hid_t_f; typedef int hid_t_f;
typedef float real_f; typedef float real_f;
#define FNAME_POST2_UNDERSCORE
#define _fcdtocp(desc) (desc) #define _fcdtocp(desc) (desc)
#endif /* DEC_ALPHA_LINUX */ #endif /* DEC_ALPHA_LINUX */
@ -197,7 +182,6 @@ typedef int int_f;
typedef int hid_t_f; typedef int hid_t_f;
typedef float real_f; typedef float real_f;
#define DF_CAPFNAMES
#define _fcdtocp(desc) (desc) #define _fcdtocp(desc) (desc)
#endif /*WINDOWS */ #endif /*WINDOWS */
@ -232,32 +216,7 @@ typedef long hssize_t_f;
typedef long size_t_f; typedef long size_t_f;
#endif /* IA64 */ #endif /* IA64 */
#define FNAME_POST_UNDERSCORE
#endif /* FreeBSD */ #endif /* FreeBSD */
/*----------------------------------------------------------------
** MACRO FNAME for any fortran callable routine name.
**
** This macro prepends, appends, or does not modify a name
** passed as a macro parameter to it based on the FNAME_PRE_UNDERSCORE,
** FNAME_POST_UNDERSCORE macros set for a specific system.
**
**---------------------------------------------------------------*/
#if defined(FNAME_PRE_UNDERSCORE) && defined(FNAME_POST_UNDERSCORE)
# define FNAME(x) _##x##_
#endif
#if defined(FNAME_PRE_UNDERSCORE) && !defined(FNAME_POST_UNDERSCORE)
# define FNAME(x) _##x
#endif
#if !defined(FNAME_PRE_UNDERSCORE) && defined(FNAME_POST_UNDERSCORE)
# define FNAME(x) x##_
#endif
#if !defined(FNAME_PRE_UNDERSCORE) && !defined(FNAME_POST_UNDERSCORE)
# define FNAME(x) x
#endif
#if !defined(FNAME_PRE_UNDERSCORE) && defined(FNAME_POST2_UNDERSCORE)
# define FNAME(x) x##__
#endif
#endif /* _H5f90i_H */ #endif /* _H5f90i_H */

1
hl/fortran/src/Makefile.in
View File

@ -153,6 +153,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
hl/fortran/test/Makefile.in
View File

@ -151,6 +151,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
hl/src/Makefile.in
View File

@ -149,6 +149,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
hl/test/Makefile.in
View File

@ -161,6 +161,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
hl/tools/gif2h5/Makefile.in
View File

@ -159,6 +159,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
perform/Makefile.in
View File

@ -175,6 +175,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

14
src/H5config.h.in
View File

@ -11,6 +11,20 @@
/* Define if `dev_t' is a scalar */ /* Define if `dev_t' is a scalar */
#undef DEV_T_IS_SCALAR #undef DEV_T_IS_SCALAR
/* Define to dummy `main' function (if any) required to link to the Fortran
libraries. */
#undef FC_DUMMY_MAIN
/* Define if F77 and FC dummy `main' functions are identical. */
#undef FC_DUMMY_MAIN_EQ_F77
/* Define to a macro mangling the given C identifier (in lower and upper
case), which must not contain underscores, for linking with Fortran. */
#undef FC_FUNC
/* As FC_FUNC, but for C identifiers containing underscores. */
#undef FC_FUNC_
/* Define if your system roundup accurately convert floating-point to unsigned /* Define if your system roundup accurately convert floating-point to unsigned
long long values. */ long long values. */
#undef FP_TO_ULLONG_BOTTOM_BIT_WORKS #undef FP_TO_ULLONG_BOTTOM_BIT_WORKS

1
src/Makefile.in
View File

@ -224,6 +224,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
test/Makefile.in
View File

@ -353,6 +353,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
testpar/Makefile.in
View File

@ -160,6 +160,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
tools/Makefile.in
View File

@ -136,6 +136,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
tools/gifconv/Makefile.in
View File

@ -159,6 +159,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
tools/h5diff/Makefile.in
View File

@ -167,6 +167,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
tools/h5dump/Makefile.in
View File

@ -160,6 +160,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
tools/h5import/Makefile.in
View File

@ -160,6 +160,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
tools/h5jam/Makefile.in
View File

@ -155,6 +155,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
tools/h5ls/Makefile.in
View File

@ -153,6 +153,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
tools/h5repack/Makefile.in
View File

@ -175,6 +175,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
tools/lib/Makefile.in
View File

@ -157,6 +157,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@

1
tools/misc/Makefile.in
View File

@ -165,6 +165,7 @@ F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@ FC = @FC@
FCFLAGS = @FCFLAGS@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
FILTERS = @FILTERS@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@ FSEARCH_DIRS = @FSEARCH_DIRS@