diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-07-28 21:38:04 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-07-28 21:38:04 (GMT) |
| commit | 0603e2db00e773702906387620e5644c23360703 (patch) | |
| tree | a3f999ab9a8ac0ae015fedb9eb45a709a99c4a85 /fortran/src/H5f90i.h | |
| parent | 6e0e3da2837214179812cf613e78227d4cbb78b3 (diff) | |
| download | hdf5-0603e2db00e773702906387620e5644c23360703.zip hdf5-0603e2db00e773702906387620e5644c23360703.tar.gz hdf5-0603e2db00e773702906387620e5644c23360703.tar.bz2 | |
[svn-r7269] Purpose:
Update
Description:
Revamped the configuration system. The configurations for the Fortran
and C++ libraries are no longer separate from the "main"
configuration system. This involved removing the "configure*" and
"aclocal.m4" files from the fortran/ and c++/ subdirectories. Also
merging settings in the config/ subdirectories into the main config/
subdirectory.
Fortran header files had to be modified a little for Linux. It was
checking if it was a Linux machine by some #defines, however with the
-std=c99 switch, these defines weren't there. I added a check for
some other ones which should be there whether the -std=c99 switch is
used or not.
Platforms tested:
Verbena (Fortran & C++)
Sol (Fortran & C++)
Copper (Fortran & C++)
Modi4 (Parallel, Fortran, & C++)
Misc. update:
Diffstat (limited to 'fortran/src/H5f90i.h')
| -rw-r--r-- | fortran/src/H5f90i.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fortran/src/H5f90i.h b/fortran/src/H5f90i.h index 1b5b7ce..663c9b5 100644 --- a/fortran/src/H5f90i.h +++ b/fortran/src/H5f90i.h @@ -94,7 +94,8 @@ typedef float real_f; #endif /*IBM6000*/ /* LINUX definitions */ -#if defined(i386) && defined(linux) +#if (defined(i386) || defined(__i386__)) && (defined(linux) || defined(__linux__)) + #define DF_MT DFMT_LINIX typedef char *_fcd; typedef long long hsize_t_f; @@ -115,6 +116,7 @@ typedef float real_f; /* IA64 LINUX definitions */ #if defined __ia64 + typedef char *_fcd; typedef long hsize_t_f; typedef long hssize_t_f; @@ -170,6 +172,7 @@ typedef float real_f; #endif /* IRIX */ #if (defined(SUN) || defined(sun) || defined(__sun__) || defined(__SUNPRO_C)) & !defined(__i386) + #ifdef __STDC__ #define ANSISUN #else /* __STDC__ */ @@ -232,7 +235,7 @@ typedef float real_f; #endif /* DEC_ALPHA */ -#if defined __alpha__ && defined __linux__ +#if defined __alpha__ && defined __linux__ #ifndef DEC_ALPHA_LINUX #define DEC_ALPHA_LINUX @@ -291,6 +294,7 @@ typedef float real_f; #if defined _WINDOWS || defined WIN32 + #define GOT_MACHINE 1 #pragma comment( lib, "oldnames" ) |