summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-05-05 16:51:46 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-05-05 16:51:46 (GMT)
commit8570c314ef67c03f9b3ef9609c49cff7ee6488c0 (patch)
treea7c549f7c0900dede57abceb77809cba421deb9b /fortran
parenta78417597b82adc7841d1aa318e816e5e79422dd (diff)
downloadhdf5-8570c314ef67c03f9b3ef9609c49cff7ee6488c0.zip
hdf5-8570c314ef67c03f9b3ef9609c49cff7ee6488c0.tar.gz
hdf5-8570c314ef67c03f9b3ef9609c49cff7ee6488c0.tar.bz2
[svn-r10729] Purpose:
Cray X1 Port Description: Porting 1.7 branch to Cray X1. With these changes, HDF5 builds, but there are some errors in the tests. Working on the errors. Solution: Added nv1-cray file to config directory. Cleaned up some code in hl/c++ that was causing compiler to complain. Platforms tested: Cray X1, mir, sleipnir Misc. update:
Diffstat (limited to 'fortran')
-rw-r--r--fortran/src/H5f90i.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/fortran/src/H5f90i.h b/fortran/src/H5f90i.h
index d3a30e9..d99353b 100644
--- a/fortran/src/H5f90i.h
+++ b/fortran/src/H5f90i.h
@@ -22,7 +22,7 @@
*/
#include "H5f90i_gen.h"
-#if (defined (UNICOS) || (defined (_UNICOS)))
+#if (defined (UNICOS) || defined (_UNICOS)) && !defined(__crayx1)
#include <fortran.h>
@@ -73,6 +73,12 @@ typedef float real_f;
#define _fcdtocp(desc) (desc)
#endif /* IRIX */
+#if defined(__crayx1)
+typedef char *_fcd;
+typedef float real_f;
+#define _fcdtocp(desc) (desc)
+#endif /* Cray X1 */
+
#if (defined(SUN) || defined(sun) || defined(__sun__) || defined(__SUNPRO_C)) & !defined(__i386)
typedef char *_fcd;