summaryrefslogtreecommitdiffstats
path: root/hl/fortran
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-04-07 19:56:06 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-04-07 19:56:06 (GMT)
commit151757f9891ca89224dabc656680332261b074ea (patch)
tree7c3a4c4ad98c2c2f3ed314aba3786334a01529ba /hl/fortran
parent527982782315d5940a207ff9321a8a9d04c14a1a (diff)
downloadhdf5-151757f9891ca89224dabc656680332261b074ea.zip
hdf5-151757f9891ca89224dabc656680332261b074ea.tar.gz
hdf5-151757f9891ca89224dabc656680332261b074ea.tar.bz2
[svn-r10571] Purpose:
Improvement Description: Changed headers in Fortran directories to use H5_FC_FUNC macro from H5pubconf.h rather than FC_FUNC macro from H5config.h. This is better practice and works better with the Windows projects. Platforms tested: heping, Windows
Diffstat (limited to 'hl/fortran')
-rwxr-xr-xhl/fortran/src/H5LTf90proto.h78
1 files changed, 39 insertions, 39 deletions
diff --git a/hl/fortran/src/H5LTf90proto.h b/hl/fortran/src/H5LTf90proto.h
index a18f599..0805a1d 100755
--- a/hl/fortran/src/H5LTf90proto.h
+++ b/hl/fortran/src/H5LTf90proto.h
@@ -16,7 +16,7 @@
#ifndef _H5LTf90proto_H
#define _H5LTf90proto_H
-#include "H5config.h"
+#include "H5pubconf.h"
#include "H5f90i.h"
H5_DLL char* HD5f2cstring (_fcd fdesc, int len);
@@ -26,58 +26,58 @@ H5_DLL void HD5packFstring (char *src, char *dest, size_t len);
/*
* Functions from H5LTfc.c
*/
-# define nh5ltmake_dataset_c FC_FUNC_(h5ltmake_dataset_c, H5LTMAKE_DATASET_C)
-# define nh5ltread_dataset_c FC_FUNC_(h5ltread_dataset_c, H5LTREAD_DATASET_C)
-# define nh5ltmake_dataset_string_c FC_FUNC_(h5ltmake_dataset_string_c, H5LTMAKE_DATASET_STRING_C)
-# define nh5ltread_dataset_string_c FC_FUNC_(h5ltread_dataset_string_c, H5LTREAD_DATASET_STRING_C)
+# define nh5ltmake_dataset_c H5_FC_FUNC_(h5ltmake_dataset_c, H5LTMAKE_DATASET_C)
+# define nh5ltread_dataset_c H5_FC_FUNC_(h5ltread_dataset_c, H5LTREAD_DATASET_C)
+# define nh5ltmake_dataset_string_c H5_FC_FUNC_(h5ltmake_dataset_string_c, H5LTMAKE_DATASET_STRING_C)
+# define nh5ltread_dataset_string_c H5_FC_FUNC_(h5ltread_dataset_string_c, 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 H5_FC_FUNC_(h5ltset_attribute_int_c, H5LTSET_ATTRIBUTE_INT_C)
+# define nh5ltset_attribute_float_c H5_FC_FUNC_(h5ltset_attribute_float_c, H5LTSET_ATTRIBUTE_FLOAT_C)
+# define nh5ltset_attribute_double_c H5_FC_FUNC_(h5ltset_attribute_double_c, H5LTSET_ATTRIBUTE_DOUBLE_C)
+# define nh5ltset_attribute_string_c H5_FC_FUNC_(h5ltset_attribute_string_c, H5LTSET_ATTRIBUTE_STRING_C)
-# define nh5ltget_attribute_int_c FC_FUNC_(h5ltget_attribute_int_c, H5LTGET_ATTRIBUTE_INT_C)
-# define nh5ltget_attribute_float_c FC_FUNC_(h5ltget_attribute_float_c, H5LTGET_ATTRIBUTE_FLOAT_C)
-# define nh5ltget_attribute_double_c FC_FUNC_(h5ltget_attribute_double_c, H5LTGET_ATTRIBUTE_DOUBLE_C)
-# define nh5ltget_attribute_string_c FC_FUNC_(h5ltget_attribute_string_c, H5LTGET_ATTRIBUTE_STRING_C)
+# define nh5ltget_attribute_int_c H5_FC_FUNC_(h5ltget_attribute_int_c, H5LTGET_ATTRIBUTE_INT_C)
+# define nh5ltget_attribute_float_c H5_FC_FUNC_(h5ltget_attribute_float_c, H5LTGET_ATTRIBUTE_FLOAT_C)
+# define nh5ltget_attribute_double_c H5_FC_FUNC_(h5ltget_attribute_double_c, H5LTGET_ATTRIBUTE_DOUBLE_C)
+# define nh5ltget_attribute_string_c H5_FC_FUNC_(h5ltget_attribute_string_c, H5LTGET_ATTRIBUTE_STRING_C)
-# define nh5ltget_dataset_ndims_c FC_FUNC_(h5ltget_dataset_ndims_c, H5LTGET_DATASET_NDIMS_C)
-# define nh5ltfind_dataset_c FC_FUNC_(h5ltfind_dataset_c, H5LTFIND_DATASET_C)
-# define nh5ltget_dataset_info_c FC_FUNC_(h5ltget_dataset_info_c, H5LTGET_DATASET_INFO_C)
+# define nh5ltget_dataset_ndims_c H5_FC_FUNC_(h5ltget_dataset_ndims_c, H5LTGET_DATASET_NDIMS_C)
+# define nh5ltfind_dataset_c H5_FC_FUNC_(h5ltfind_dataset_c, H5LTFIND_DATASET_C)
+# define nh5ltget_dataset_info_c H5_FC_FUNC_(h5ltget_dataset_info_c, H5LTGET_DATASET_INFO_C)
-# define nh5ltget_attribute_ndims_c FC_FUNC_(h5ltget_attribute_ndims_c, H5LTGET_ATTRIBUTE_NDIMS_C)
-# define nh5ltget_attribute_info_c FC_FUNC_(h5ltget_attribute_info_c, H5LTGET_ATTRIBUTE_INFO_C)
+# define nh5ltget_attribute_ndims_c H5_FC_FUNC_(h5ltget_attribute_ndims_c, H5LTGET_ATTRIBUTE_NDIMS_C)
+# define nh5ltget_attribute_info_c H5_FC_FUNC_(h5ltget_attribute_info_c, H5LTGET_ATTRIBUTE_INFO_C)
/*-------------------------------------------------------------------------
* Image
*-------------------------------------------------------------------------
*/
-# define nh5immake_image_8bit_c FC_FUNC_(h5immake_image_8bit_c, H5IMMAKE_IMAGE_8BIT_C)
-# define nh5immake_image_24bit_c FC_FUNC_(h5immake_image_24bit_c, H5IMMAKE_IMAGE_24BIT_C)
-# define nh5imread_image_c FC_FUNC_(h5imread_image_c, H5IMREAD_IMAGE_C)
-# define nh5imget_image_info_c FC_FUNC_(h5imget_image_info_c, H5IMGET_IMAGE_INFO_C)
-# define nh5imis_image_c FC_FUNC_(h5imis_image_c, H5IMIS_IMAGE_C)
-# define nh5immake_palette_c FC_FUNC_(h5immake_palette_c, H5IMMAKE_PALETTE_C)
-# define nh5imlink_palette_c FC_FUNC_(h5imlink_palette_c, H5IMLINK_PALETTE_C)
-# define nh5imunlink_palette_c FC_FUNC_(h5imunlink_palette_c, H5IMUNLINK_PALETTE_C)
-# define nh5imget_npalettes_c FC_FUNC_(h5imget_npalettes_c, H5IMGET_NPALETTES_C)
-# define nh5imget_palette_info_c FC_FUNC_(h5imget_palette_info_c, H5IMGET_PALETTE_INFO_C)
-# define nh5imget_palette_c FC_FUNC_(h5imget_palette_c, H5IMGET_PALETTE_C)
-# define nh5imis_palette_c FC_FUNC_(h5imis_palette_c, H5IMIS_PALETTE_C)
+# define nh5immake_image_8bit_c H5_FC_FUNC_(h5immake_image_8bit_c, H5IMMAKE_IMAGE_8BIT_C)
+# define nh5immake_image_24bit_c H5_FC_FUNC_(h5immake_image_24bit_c, H5IMMAKE_IMAGE_24BIT_C)
+# define nh5imread_image_c H5_FC_FUNC_(h5imread_image_c, H5IMREAD_IMAGE_C)
+# define nh5imget_image_info_c H5_FC_FUNC_(h5imget_image_info_c, H5IMGET_IMAGE_INFO_C)
+# define nh5imis_image_c H5_FC_FUNC_(h5imis_image_c, H5IMIS_IMAGE_C)
+# define nh5immake_palette_c H5_FC_FUNC_(h5immake_palette_c, H5IMMAKE_PALETTE_C)
+# define nh5imlink_palette_c H5_FC_FUNC_(h5imlink_palette_c, H5IMLINK_PALETTE_C)
+# define nh5imunlink_palette_c H5_FC_FUNC_(h5imunlink_palette_c, H5IMUNLINK_PALETTE_C)
+# define nh5imget_npalettes_c H5_FC_FUNC_(h5imget_npalettes_c, H5IMGET_NPALETTES_C)
+# define nh5imget_palette_info_c H5_FC_FUNC_(h5imget_palette_info_c, H5IMGET_PALETTE_INFO_C)
+# define nh5imget_palette_c H5_FC_FUNC_(h5imget_palette_c, H5IMGET_PALETTE_C)
+# define nh5imis_palette_c H5_FC_FUNC_(h5imis_palette_c, H5IMIS_PALETTE_C)
/*-------------------------------------------------------------------------
* Table
*-------------------------------------------------------------------------
*/
-# define nh5tbmake_table_c FC_FUNC_(h5tbmake_table_c, H5TBMAKE_TABLE_C)
-# define nh5tbwrite_field_name_c FC_FUNC_(h5tbwrite_field_name_c, H5TBWRITE_FIELD_NAME_C)
-# define nh5tbread_field_name_c FC_FUNC_(h5tbread_field_name_c, H5TBREAD_FIELD_NAME_C)
-# define nh5tbwrite_field_index_c FC_FUNC_(h5tbwrite_field_index_c, H5TBWRITE_FIELD_INDEX_C)
-# define nh5tbread_field_index_c FC_FUNC_(h5tbread_field_index_c, H5TBREAD_FIELD_INDEX_C)
-# define nh5tbinsert_field_c FC_FUNC_(h5tbinsert_field_c, H5TBINSERT_FIELD_C)
-# define nh5tbdelete_field_c FC_FUNC_(h5tbdelete_field_c, H5TBDELETE_FIELD_C)
-# define nh5tbget_table_info_c FC_FUNC_(h5tbget_table_info_c, H5TBGET_TABLE_INFO_C)
-# define nh5tbget_field_info_c FC_FUNC_(h5tbget_field_info_c, H5TBGET_FIELD_INFO_C)
+# define nh5tbmake_table_c H5_FC_FUNC_(h5tbmake_table_c, H5TBMAKE_TABLE_C)
+# define nh5tbwrite_field_name_c H5_FC_FUNC_(h5tbwrite_field_name_c, H5TBWRITE_FIELD_NAME_C)
+# define nh5tbread_field_name_c H5_FC_FUNC_(h5tbread_field_name_c, H5TBREAD_FIELD_NAME_C)
+# define nh5tbwrite_field_index_c H5_FC_FUNC_(h5tbwrite_field_index_c, H5TBWRITE_FIELD_INDEX_C)
+# define nh5tbread_field_index_c H5_FC_FUNC_(h5tbread_field_index_c, H5TBREAD_FIELD_INDEX_C)
+# define nh5tbinsert_field_c H5_FC_FUNC_(h5tbinsert_field_c, H5TBINSERT_FIELD_C)
+# define nh5tbdelete_field_c H5_FC_FUNC_(h5tbdelete_field_c, H5TBDELETE_FIELD_C)
+# define nh5tbget_table_info_c H5_FC_FUNC_(h5tbget_table_info_c, H5TBGET_TABLE_INFO_C)
+# define nh5tbget_field_info_c H5_FC_FUNC_(h5tbget_field_info_c, H5TBGET_FIELD_INFO_C)
H5_DLL
int_f