diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2004-10-12 16:05:31 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2004-10-12 16:05:31 (GMT) |
| commit | 3b057e2f232d99b9322a480742a37624b54eb8aa (patch) | |
| tree | c7fecaa3ac668e6c67c41054cda96110d689aa18 | |
| parent | 6af597329501e59021396f4bd4b3a8ea268d8ce8 (diff) | |
| download | hdf5-3b057e2f232d99b9322a480742a37624b54eb8aa.zip hdf5-3b057e2f232d99b9322a480742a37624b54eb8aa.tar.gz hdf5-3b057e2f232d99b9322a480742a37624b54eb8aa.tar.bz2 | |
[svn-r9405] Purpose:
Bug fix
Description:
Correct/update detection of Linux platforms.
Also, refactor common code out of different architectures for Linux builds.
Platforms tested:
Linux 2.4 (verbena)
Too minor to require h5commitest
| -rw-r--r-- | fortran/src/H5f90i.h | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/fortran/src/H5f90i.h b/fortran/src/H5f90i.h index 3f747c0..996a143 100644 --- a/fortran/src/H5f90i.h +++ b/fortran/src/H5f90i.h @@ -69,52 +69,45 @@ typedef float real_f; /* LINUX definitions */ -#if (defined(i386) || defined(__i386__)) && (defined(linux) || defined(__linux__)) +#if (defined(linux) || defined(__gnu_linux__) || defined(__linux__)) +/* Common definitions */ typedef char *_fcd; -typedef long long hsize_t_f; -typedef long long hssize_t_f; -typedef int size_t_f; typedef int int_f; typedef int hid_t_f; typedef float real_f; +#define _fcdtocp(desc) (desc) + +/* IA32 specific definitions */ +#if (defined(i386) || defined(__i386) || defined(__i386__)) + +typedef long long hsize_t_f; +typedef long long hssize_t_f; +typedef int size_t_f; #if defined H5_ABSOFT #define DF_CAPFNAMES #else #define FNAME_POST_UNDERSCORE #endif /*H5_ABSOFT*/ -#define _fcdtocp(desc) (desc) - -#endif /*LINUX*/ -/* LINUX64 definitions */ -#if defined __x86_64__ +/* AMD64 specific definitions */ +#elif defined __x86_64__ -typedef char *_fcd; typedef long long hsize_t_f; typedef long long hssize_t_f; typedef int size_t_f; -typedef int int_f; -typedef int hid_t_f; -typedef float real_f; #define FNAME_POST_UNDERSCORE -#define _fcdtocp(desc) (desc) -#endif /*LINUX64*/ -/* IA64 LINUX definitions */ -#if defined __ia64 +/* IA64 specific definitions */ +#elif defined __ia64 -typedef char *_fcd; typedef long hsize_t_f; typedef long hssize_t_f; typedef long size_t_f; -typedef int int_f; -typedef int hid_t_f; -typedef float real_f; #define FNAME_POST_UNDERSCORE -#define _fcdtocp(desc) (desc) #endif /* IA64 LINUX*/ +#endif /* LINUX*/ #if defined(IRIX) || defined(IRIS4) || defined(sgi) || defined(__sgi__) || defined(__sgi) |