[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

3 files changed, 333 insertions, 333 deletions

diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index 64196a4..ff7678b 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -16,7 +16,7 @@
 #ifndef _H5f90proto_H
 #define _H5f90proto_H
 
-#include "H5config.h"
+#include "H5pubconf.h"
 
 H5_FCDLL char * HD5f2cstring (_fcd fdesc, size_t len);
 H5_FCDLL void HD5packFstring(char *src, char *dest, size_t len);
@@ -24,21 +24,21 @@ H5_FCDLL void HD5packFstring(char *src, char *dest, size_t len);
 /*
  *  Functions from H5Ff.c
  */
-#   define nh5fcreate_c              FC_FUNC_(h5fcreate_c, H5FCREATE_C)
-#   define nh5fflush_c               FC_FUNC_(h5fflush_c, H5FFLUSH_C)
-#   define nh5fclose_c               FC_FUNC_(h5fclose_c, H5FCLOSE_C)
-#   define nh5fopen_c                FC_FUNC_(h5fopen_c, H5FOPEN_C)
-#   define nh5fis_hdf5_c             FC_FUNC_(h5fis_hdf5_c, H5FIS_HDF5_C)
-#   define nh5fmount_c               FC_FUNC_(h5fmount_c, H5FMOUNT_C)
-#   define nh5funmount_c             FC_FUNC_(h5funmount_c, H5FUNMOUNT_C)
-#   define nh5freopen_c              FC_FUNC_(h5freopen_c, H5FREOPEN_C)
-#   define nh5fget_create_plist_c    FC_FUNC_(h5fget_create_plist_c, H5FGET_CREATE_PLIST_C)
-#   define nh5fget_access_plist_c    FC_FUNC_(h5fget_access_plist_c, H5FGET_ACCESS_PLIST_C)
-#   define nh5fget_obj_count_c       FC_FUNC_(h5fget_obj_count_c, H5FGET_OBJ_COUNT_C)
-#   define nh5fget_obj_ids_c         FC_FUNC_(h5fget_obj_ids_c, H5FGET_OBJ_IDS_C)
-#   define nh5fget_freespace_c       FC_FUNC_(h5fget_freespace_c, H5FGET_FREESPACE_C)
-#   define nh5fget_name_c            FC_FUNC_(h5fget_name_c, H5FGET_NAME_C)
-#   define nh5fget_filesize_c        FC_FUNC_(h5fget_filesize_c, H5FGET_FILESIZE_C)
+#   define nh5fcreate_c              H5_FC_FUNC_(h5fcreate_c, H5FCREATE_C)
+#   define nh5fflush_c               H5_FC_FUNC_(h5fflush_c, H5FFLUSH_C)
+#   define nh5fclose_c               H5_FC_FUNC_(h5fclose_c, H5FCLOSE_C)
+#   define nh5fopen_c                H5_FC_FUNC_(h5fopen_c, H5FOPEN_C)
+#   define nh5fis_hdf5_c             H5_FC_FUNC_(h5fis_hdf5_c, H5FIS_HDF5_C)
+#   define nh5fmount_c               H5_FC_FUNC_(h5fmount_c, H5FMOUNT_C)
+#   define nh5funmount_c             H5_FC_FUNC_(h5funmount_c, H5FUNMOUNT_C)
+#   define nh5freopen_c              H5_FC_FUNC_(h5freopen_c, H5FREOPEN_C)
+#   define nh5fget_create_plist_c    H5_FC_FUNC_(h5fget_create_plist_c, H5FGET_CREATE_PLIST_C)
+#   define nh5fget_access_plist_c    H5_FC_FUNC_(h5fget_access_plist_c, H5FGET_ACCESS_PLIST_C)
+#   define nh5fget_obj_count_c       H5_FC_FUNC_(h5fget_obj_count_c, H5FGET_OBJ_COUNT_C)
+#   define nh5fget_obj_ids_c         H5_FC_FUNC_(h5fget_obj_ids_c, H5FGET_OBJ_IDS_C)
+#   define nh5fget_freespace_c       H5_FC_FUNC_(h5fget_freespace_c, H5FGET_FREESPACE_C)
+#   define nh5fget_name_c            H5_FC_FUNC_(h5fget_name_c, H5FGET_NAME_C)
+#   define nh5fget_filesize_c        H5_FC_FUNC_(h5fget_filesize_c, H5FGET_FILESIZE_C)
 
 H5_FCDLL int_f nh5fcreate_c (_fcd name, int_f *namelen, int_f *access_flags, hid_t_f *crt_prp, hid_t_f *acc_prp, hid_t_f *file_id);
 H5_FCDLL int_f nh5fopen_c (_fcd name, int_f *namelen, int_f *access_flags, hid_t_f *acc_prp, hid_t_f *file_id);
@@ -59,35 +59,35 @@ H5_FCDLL int_f nh5fget_filesize_c(hid_t_f *file_id, hsize_t_f *size);
 /*
  * Functions from H5Sf.c
  */
-#   define nh5screate_simple_c      FC_FUNC_(h5screate_simple_c, H5SCREATE_SIMPLE_C)
-#   define nh5sclose_c              FC_FUNC_(h5sclose_c, H5SCLOSE_C)
-#   define nh5screate_c             FC_FUNC_(h5screate_c, H5SCREATE_C)
-#   define nh5scopy_c               FC_FUNC_(h5scopy_c, H5SCOPY_C)
-#   define nh5sget_select_hyper_nblocks_c FC_FUNC_(h5sget_select_hyper_nblocks_c, H5SGET_SELECT_HYPER_NBLOCKS_C)
-#   define nh5sget_select_hyper_blocklist_c FC_FUNC_(h5sget_select_hyper_blocklist_c, H5SGET_SELECT_HYPER_BLOCKLIST_C)
-#   define nh5sget_select_elem_npoints_c FC_FUNC_(h5sget_select_elem_npoints_c, H5SGET_SELECT_ELEM_NPOINTS_C)
-#   define nh5sget_select_elem_pointlist_c FC_FUNC_(h5sget_select_elem_pointlist_c, H5SGET_SELECT_ELEM_POINTLIST_C)
-#   define nh5sget_select_bounds_c  FC_FUNC_(h5sget_select_bounds_c, H5SGET_SELECT_BOUNDS_C)
-#   define nh5sselect_all_c         FC_FUNC_(h5sselect_all_c, H5SSELECT_ALL_C)
-#   define nh5sselect_none_c        FC_FUNC_(h5sselect_none_c, H5SSELECT_NONE_C)
-#   define nh5sselect_valid_c       FC_FUNC_(h5sselect_valid_c, H5SSELECT_VALID_C)
-#   define nh5sget_simple_extent_npoints_c FC_FUNC_(h5sget_simple_extent_npoints_c, H5SGET_SIMPLE_EXTENT_NPOINTS_C)
-#   define nh5sget_select_npoints_c FC_FUNC_(h5sget_select_npoints_c, H5SGET_SELECT_NPOINTS_C)
-#   define nh5sget_simple_extent_ndims_c FC_FUNC_(h5sget_simple_extent_ndims_c, H5SGET_SIMPLE_EXTENT_NDIMS_C)
-#   define nh5sget_simple_extent_type_c  FC_FUNC_(h5sget_simple_extent_type_c, H5SGET_SIMPLE_EXTENT_TYPE_C)
-#   define nh5soffset_simple_c      FC_FUNC_(h5soffset_simple_c, H5SOFFSET_SIMPLE_C)
-#   define nh5sset_extent_simple_c  FC_FUNC_(h5sset_extent_simple_c, H5SSET_EXTENT_SIMPLE_C)
-#   define nh5sis_simple_c          FC_FUNC_(h5sis_simple_c, H5SIS_SIMPLE_C)
-#   define nh5sextent_class_c       FC_FUNC_(h5sextent_class_c, H5SEXTENT_CLASS_C)
-#   define nh5sget_simple_extent_dims_c FC_FUNC_(h5sget_simple_extent_dims_c, H5SGET_SIMPLE_EXTENT_DIMS_C)
-#   define nh5sextent_copy_c        FC_FUNC_(h5sextent_copy_c, H5SEXTENT_COPY_C)
-#   define nh5sset_extent_none_c    FC_FUNC_(h5sset_extent_none_c, H5SSET_EXTENT_NONE_C)
-#   define nh5sselect_hyperslab_c   FC_FUNC_(h5sselect_hyperslab_c, H5SSELECT_HYPERSLAB_C)
-#   define nh5scombine_hyperslab_c   FC_FUNC_(h5scombine_hyperslab_c, H5SCOMBINE_HYPERSLAB_C)
-#   define nh5scombine_select_c   FC_FUNC_(h5scombine_select_c, H5SCOMBINE_SELECT_C)
-#   define nh5sselect_select_c   FC_FUNC_(h5sselect_select_c, H5SSELECT_SELECT_C)
-#   define nh5sget_select_type_c   FC_FUNC_(h5sget_select_type_c, H5SGET_SELECT_TYPE_C)
-#   define nh5sselect_elements_c    FC_FUNC_(h5sselect_elements_c, H5SSELECT_ELEMENTS_C)
+#   define nh5screate_simple_c      H5_FC_FUNC_(h5screate_simple_c, H5SCREATE_SIMPLE_C)
+#   define nh5sclose_c              H5_FC_FUNC_(h5sclose_c, H5SCLOSE_C)
+#   define nh5screate_c             H5_FC_FUNC_(h5screate_c, H5SCREATE_C)
+#   define nh5scopy_c               H5_FC_FUNC_(h5scopy_c, H5SCOPY_C)
+#   define nh5sget_select_hyper_nblocks_c H5_FC_FUNC_(h5sget_select_hyper_nblocks_c, H5SGET_SELECT_HYPER_NBLOCKS_C)
+#   define nh5sget_select_hyper_blocklist_c H5_FC_FUNC_(h5sget_select_hyper_blocklist_c, H5SGET_SELECT_HYPER_BLOCKLIST_C)
+#   define nh5sget_select_elem_npoints_c H5_FC_FUNC_(h5sget_select_elem_npoints_c, H5SGET_SELECT_ELEM_NPOINTS_C)
+#   define nh5sget_select_elem_pointlist_c H5_FC_FUNC_(h5sget_select_elem_pointlist_c, H5SGET_SELECT_ELEM_POINTLIST_C)
+#   define nh5sget_select_bounds_c  H5_FC_FUNC_(h5sget_select_bounds_c, H5SGET_SELECT_BOUNDS_C)
+#   define nh5sselect_all_c         H5_FC_FUNC_(h5sselect_all_c, H5SSELECT_ALL_C)
+#   define nh5sselect_none_c        H5_FC_FUNC_(h5sselect_none_c, H5SSELECT_NONE_C)
+#   define nh5sselect_valid_c       H5_FC_FUNC_(h5sselect_valid_c, H5SSELECT_VALID_C)
+#   define nh5sget_simple_extent_npoints_c H5_FC_FUNC_(h5sget_simple_extent_npoints_c, H5SGET_SIMPLE_EXTENT_NPOINTS_C)
+#   define nh5sget_select_npoints_c H5_FC_FUNC_(h5sget_select_npoints_c, H5SGET_SELECT_NPOINTS_C)
+#   define nh5sget_simple_extent_ndims_c H5_FC_FUNC_(h5sget_simple_extent_ndims_c, H5SGET_SIMPLE_EXTENT_NDIMS_C)
+#   define nh5sget_simple_extent_type_c  H5_FC_FUNC_(h5sget_simple_extent_type_c, H5SGET_SIMPLE_EXTENT_TYPE_C)
+#   define nh5soffset_simple_c      H5_FC_FUNC_(h5soffset_simple_c, H5SOFFSET_SIMPLE_C)
+#   define nh5sset_extent_simple_c  H5_FC_FUNC_(h5sset_extent_simple_c, H5SSET_EXTENT_SIMPLE_C)
+#   define nh5sis_simple_c          H5_FC_FUNC_(h5sis_simple_c, H5SIS_SIMPLE_C)
+#   define nh5sextent_class_c       H5_FC_FUNC_(h5sextent_class_c, H5SEXTENT_CLASS_C)
+#   define nh5sget_simple_extent_dims_c H5_FC_FUNC_(h5sget_simple_extent_dims_c, H5SGET_SIMPLE_EXTENT_DIMS_C)
+#   define nh5sextent_copy_c        H5_FC_FUNC_(h5sextent_copy_c, H5SEXTENT_COPY_C)
+#   define nh5sset_extent_none_c    H5_FC_FUNC_(h5sset_extent_none_c, H5SSET_EXTENT_NONE_C)
+#   define nh5sselect_hyperslab_c   H5_FC_FUNC_(h5sselect_hyperslab_c, H5SSELECT_HYPERSLAB_C)
+#   define nh5scombine_hyperslab_c   H5_FC_FUNC_(h5scombine_hyperslab_c, H5SCOMBINE_HYPERSLAB_C)
+#   define nh5scombine_select_c   H5_FC_FUNC_(h5scombine_select_c, H5SCOMBINE_SELECT_C)
+#   define nh5sselect_select_c   H5_FC_FUNC_(h5sselect_select_c, H5SSELECT_SELECT_C)
+#   define nh5sget_select_type_c   H5_FC_FUNC_(h5sget_select_type_c, H5SGET_SELECT_TYPE_C)
+#   define nh5sselect_elements_c    H5_FC_FUNC_(h5sselect_elements_c, H5SSELECT_ELEMENTS_C)
 
 H5_FCDLL int_f nh5screate_simple_c ( int_f *rank, hsize_t_f *dims, hsize_t_f *maxdims, hid_t_f *space_id );
 H5_FCDLL int_f nh5sclose_c ( hid_t_f *space_id );
@@ -122,34 +122,34 @@ H5_FCDLL int_f nh5sselect_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *sp
 /*
  * Functions from H5Df.c
  */
-#   define nh5dcreate_c                FC_FUNC_(h5dcreate_c, H5DCREATE_C)
-#   define nh5dclose_c                 FC_FUNC_(h5dclose_c, H5DCLOSE_C)
-#   define nh5dopen_c                  FC_FUNC_(h5dopen_c, H5DOPEN_C)
-#   define nh5dwrite_c                 FC_FUNC_(h5dwrite_c, H5DWRITE_C)
-#   define nh5dwrite_ref_obj_c         FC_FUNC_(h5dwrite_ref_obj_c, H5DWRITE_REF_OBJ_C)
-#   define nh5dwrite_ref_reg_c         FC_FUNC_(h5dwrite_ref_reg_c, H5DWRITE_REF_REG_C)
-#   define nh5dwritec_c                FC_FUNC_(h5dwritec_c, H5DWRITEC_C)
-#   define nh5dread_c                  FC_FUNC_(h5dread_c, H5DREAD_C)
-#   define nh5dread_c_b                FC_FUNC_(h5dread_c_b, H5DREAD_C_B)
-#   define nh5dread_ref_reg_c          FC_FUNC_(h5dread_ref_reg_c, H5DREAD_REF_REG_C)
-#   define nh5dread_ref_obj_c          FC_FUNC_(h5dread_ref_obj_c, H5DREAD_REF_OBJ_C)
-#   define nh5dreadc_c                 FC_FUNC_(h5dreadc_c, H5DREADC_C)
-#   define nh5dreadc_c_b               FC_FUNC_(h5dreadc_c_b, H5DREADC_C_B)
-#   define nh5dget_space_c             FC_FUNC_(h5dget_space_c, H5DGET_SPACE_C)
-#   define nh5dget_type_c              FC_FUNC_(h5dget_type_c, H5DGET_TYPE_C)
-#   define nh5dget_create_plist_c      FC_FUNC_(h5dget_create_plist_c, H5DGET_CREATE_PLIST_C)
-#   define nh5dextend_c                FC_FUNC_(h5dextend_c, H5DEXTEND_C)
-#   define nh5dget_storage_size_c      FC_FUNC_(h5dget_storage_size_c, H5DGET_STORAGE_SIZE_C)
-#   define nh5dvlen_get_max_len_c      FC_FUNC_(h5dvlen_get_max_len_c, H5DVLEN_GET_MAX_LEN_C)
-#   define nh5dwrite_vl_integer_c      FC_FUNC_(h5dwrite_vl_integer_c, H5DWRITE_VL_INTEGER_C)
-#   define nh5dread_vl_integer_c       FC_FUNC_(h5dread_vl_integer_c, H5DREAD_VL_INTEGER_C)
-#   define nh5dwrite_vl_real_c         FC_FUNC_(h5dwrite_vl_real_c, H5DWRITE_VL_REAL_C)
-#   define nh5dread_vl_real_c          FC_FUNC_(h5dread_vl_real_c, H5DREAD_VL_REAL_C)
-#   define nh5dwrite_vl_string_c       FC_FUNC_(h5dwrite_vl_string_c, H5DWRITE_VL_STRING_C)
-#   define nh5dread_vl_string_c        FC_FUNC_(h5dread_vl_string_c, H5DREAD_VL_STRING_C)
-#   define nh5dfillc_c                 FC_FUNC_(h5dfillc_c, H5DFILLC_C)
-#   define nh5dfill_c                  FC_FUNC_(h5dfill_c, H5DFILL_C)
-#   define nh5dget_space_status_c      FC_FUNC_(h5dget_space_status_c, H5DGET_SPACE_STATUS_C)
+#   define nh5dcreate_c                H5_FC_FUNC_(h5dcreate_c, H5DCREATE_C)
+#   define nh5dclose_c                 H5_FC_FUNC_(h5dclose_c, H5DCLOSE_C)
+#   define nh5dopen_c                  H5_FC_FUNC_(h5dopen_c, H5DOPEN_C)
+#   define nh5dwrite_c                 H5_FC_FUNC_(h5dwrite_c, H5DWRITE_C)
+#   define nh5dwrite_ref_obj_c         H5_FC_FUNC_(h5dwrite_ref_obj_c, H5DWRITE_REF_OBJ_C)
+#   define nh5dwrite_ref_reg_c         H5_FC_FUNC_(h5dwrite_ref_reg_c, H5DWRITE_REF_REG_C)
+#   define nh5dwritec_c                H5_FC_FUNC_(h5dwritec_c, H5DWRITEC_C)
+#   define nh5dread_c                  H5_FC_FUNC_(h5dread_c, H5DREAD_C)
+#   define nh5dread_c_b                H5_FC_FUNC_(h5dread_c_b, H5DREAD_C_B)
+#   define nh5dread_ref_reg_c          H5_FC_FUNC_(h5dread_ref_reg_c, H5DREAD_REF_REG_C)
+#   define nh5dread_ref_obj_c          H5_FC_FUNC_(h5dread_ref_obj_c, H5DREAD_REF_OBJ_C)
+#   define nh5dreadc_c                 H5_FC_FUNC_(h5dreadc_c, H5DREADC_C)
+#   define nh5dreadc_c_b               H5_FC_FUNC_(h5dreadc_c_b, H5DREADC_C_B)
+#   define nh5dget_space_c             H5_FC_FUNC_(h5dget_space_c, H5DGET_SPACE_C)
+#   define nh5dget_type_c              H5_FC_FUNC_(h5dget_type_c, H5DGET_TYPE_C)
+#   define nh5dget_create_plist_c      H5_FC_FUNC_(h5dget_create_plist_c, H5DGET_CREATE_PLIST_C)
+#   define nh5dextend_c                H5_FC_FUNC_(h5dextend_c, H5DEXTEND_C)
+#   define nh5dget_storage_size_c      H5_FC_FUNC_(h5dget_storage_size_c, H5DGET_STORAGE_SIZE_C)
+#   define nh5dvlen_get_max_len_c      H5_FC_FUNC_(h5dvlen_get_max_len_c, H5DVLEN_GET_MAX_LEN_C)
+#   define nh5dwrite_vl_integer_c      H5_FC_FUNC_(h5dwrite_vl_integer_c, H5DWRITE_VL_INTEGER_C)
+#   define nh5dread_vl_integer_c       H5_FC_FUNC_(h5dread_vl_integer_c, H5DREAD_VL_INTEGER_C)
+#   define nh5dwrite_vl_real_c         H5_FC_FUNC_(h5dwrite_vl_real_c, H5DWRITE_VL_REAL_C)
+#   define nh5dread_vl_real_c          H5_FC_FUNC_(h5dread_vl_real_c, H5DREAD_VL_REAL_C)
+#   define nh5dwrite_vl_string_c       H5_FC_FUNC_(h5dwrite_vl_string_c, H5DWRITE_VL_STRING_C)
+#   define nh5dread_vl_string_c        H5_FC_FUNC_(h5dread_vl_string_c, H5DREAD_VL_STRING_C)
+#   define nh5dfillc_c                 H5_FC_FUNC_(h5dfillc_c, H5DFILLC_C)
+#   define nh5dfill_c                  H5_FC_FUNC_(h5dfill_c, H5DFILL_C)
+#   define nh5dget_space_status_c      H5_FC_FUNC_(h5dget_space_status_c, H5DGET_SPACE_STATUS_C)
 
 
 H5_FCDLL int_f nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id, hid_t_f *crt_prp,  hid_t_f *dset_id);
@@ -182,19 +182,19 @@ H5_FCDLL int_f nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag);
 /*
  * Functions from H5Gf.c
  */
-#   define nh5gcreate_c      FC_FUNC_(h5gcreate_c, H5GCREATE_C)
-#   define nh5gclose_c       FC_FUNC_(h5gclose_c, H5GCLOSE_C)
-#   define nh5gopen_c        FC_FUNC_(h5gopen_c, H5GOPEN_C)
-#   define nh5gget_obj_info_idx_c FC_FUNC_(h5gget_obj_info_idx_c, H5GGET_OBJ_INFO_IDX_C)
-#   define nh5gn_members_c   FC_FUNC_(h5gn_members_c, H5GN_MEMBERS_C)
-#   define nh5glink_c        FC_FUNC_(h5glink_c, H5GLINK_C)
-#   define nh5glink2_c        FC_FUNC_(h5glink2_c, H5GLINK2_C)
-#   define nh5gunlink_c      FC_FUNC_(h5gunlink_c, H5GUNLINK_C)
-#   define nh5gmove_c        FC_FUNC_(h5gmove_c, H5GMOVE_C)
-#   define nh5gmove2_c        FC_FUNC_(h5gmove2_c, H5GMOVE2_C)
-#   define nh5gget_linkval_c   FC_FUNC_(h5gget_linkval_c, H5GGET_LINKVAL_C)
-#   define nh5gset_comment_c   FC_FUNC_(h5gset_comment_c, H5GSET_COMMENT_C)
-#   define nh5gget_comment_c   FC_FUNC_(h5gget_comment_c, H5GGET_COMMENT_C)
+#   define nh5gcreate_c      H5_FC_FUNC_(h5gcreate_c, H5GCREATE_C)
+#   define nh5gclose_c       H5_FC_FUNC_(h5gclose_c, H5GCLOSE_C)
+#   define nh5gopen_c        H5_FC_FUNC_(h5gopen_c, H5GOPEN_C)
+#   define nh5gget_obj_info_idx_c H5_FC_FUNC_(h5gget_obj_info_idx_c, H5GGET_OBJ_INFO_IDX_C)
+#   define nh5gn_members_c   H5_FC_FUNC_(h5gn_members_c, H5GN_MEMBERS_C)
+#   define nh5glink_c        H5_FC_FUNC_(h5glink_c, H5GLINK_C)
+#   define nh5glink2_c        H5_FC_FUNC_(h5glink2_c, H5GLINK2_C)
+#   define nh5gunlink_c      H5_FC_FUNC_(h5gunlink_c, H5GUNLINK_C)
+#   define nh5gmove_c        H5_FC_FUNC_(h5gmove_c, H5GMOVE_C)
+#   define nh5gmove2_c        H5_FC_FUNC_(h5gmove2_c, H5GMOVE2_C)
+#   define nh5gget_linkval_c   H5_FC_FUNC_(h5gget_linkval_c, H5GGET_LINKVAL_C)
+#   define nh5gset_comment_c   H5_FC_FUNC_(h5gset_comment_c, H5GSET_COMMENT_C)
+#   define nh5gget_comment_c   H5_FC_FUNC_(h5gget_comment_c, H5GGET_COMMENT_C)
 
 
 H5_FCDLL int_f nh5gcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size_hint,  hid_t_f *grp_id);
@@ -214,19 +214,19 @@ H5_FCDLL int_f nh5gget_comment_c (hid_t_f *loc_id, _fcd name, int_f *namelen, si
 /*
  * Functions from H5Af.c
  */
-#   define nh5acreate_c      FC_FUNC_(h5acreate_c, H5ACREATE_C)
-#   define nh5aclose_c       FC_FUNC_(h5aclose_c, H5ACLOSE_C)
-#   define nh5aopen_name_c   FC_FUNC_(h5aopen_name_c, H5AOPEN_NAME_C)
-#   define nh5awrite_c       FC_FUNC_(h5awrite_c, H5AWRITE_C)
-#   define nh5awritec_c      FC_FUNC_(h5awritec_c, H5AWRITEC_C)
-#   define nh5aread_c        FC_FUNC_(h5aread_c, H5AREAD_C)
-#   define nh5areadc_c       FC_FUNC_(h5areadc_c, H5AREADC_C)
-#   define nh5aget_name_c    FC_FUNC_(h5aget_name_c, H5AGET_NAME_C)
-#   define nh5aopen_idx_c    FC_FUNC_(h5aopen_idx_c, H5AOPEN_IDX_C)
-#   define nh5aget_space_c   FC_FUNC_(h5aget_space_c, H5AGET_SPACE_C)
-#   define nh5aget_type_c    FC_FUNC_(h5aget_type_c, H5AGET_TYPE_C)
-#   define nh5aget_num_attrs_c FC_FUNC_(h5aget_num_attrs_c, H5AGET_NUM_ATTRS_C)
-#   define nh5adelete_c      FC_FUNC_(h5adelete_c, H5ADELETE_C)
+#   define nh5acreate_c      H5_FC_FUNC_(h5acreate_c, H5ACREATE_C)
+#   define nh5aclose_c       H5_FC_FUNC_(h5aclose_c, H5ACLOSE_C)
+#   define nh5aopen_name_c   H5_FC_FUNC_(h5aopen_name_c, H5AOPEN_NAME_C)
+#   define nh5awrite_c       H5_FC_FUNC_(h5awrite_c, H5AWRITE_C)
+#   define nh5awritec_c      H5_FC_FUNC_(h5awritec_c, H5AWRITEC_C)
+#   define nh5aread_c        H5_FC_FUNC_(h5aread_c, H5AREAD_C)
+#   define nh5areadc_c       H5_FC_FUNC_(h5areadc_c, H5AREADC_C)
+#   define nh5aget_name_c    H5_FC_FUNC_(h5aget_name_c, H5AGET_NAME_C)
+#   define nh5aopen_idx_c    H5_FC_FUNC_(h5aopen_idx_c, H5AOPEN_IDX_C)
+#   define nh5aget_space_c   H5_FC_FUNC_(h5aget_space_c, H5AGET_SPACE_C)
+#   define nh5aget_type_c    H5_FC_FUNC_(h5aget_type_c, H5AGET_TYPE_C)
+#   define nh5aget_num_attrs_c H5_FC_FUNC_(h5aget_num_attrs_c, H5AGET_NUM_ATTRS_C)
+#   define nh5adelete_c      H5_FC_FUNC_(h5adelete_c, H5ADELETE_C)
 
 
 H5_FCDLL int_f nh5acreate_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *type_id, hid_t_f *space_id, hid_t_f *crt_prp,  hid_t_f *attr_id);
@@ -246,62 +246,62 @@ H5_FCDLL int_f nh5aget_name_c(hid_t_f *attr_id, size_t_f *size, _fcd buf);
 /* 
  * Functions form H5Tf.c file
  */
-#   define nh5topen_c         FC_FUNC_(h5topen_c, H5TOPEN_C)
-#   define nh5tcommit_c       FC_FUNC_(h5tcommit_c, H5TCOMMIT_C)
-#   define nh5tcommitted_c    FC_FUNC_(h5tcommitted_c, H5TCOMMITTED_C)
-#   define nh5tclose_c        FC_FUNC_(h5tclose_c, H5TCLOSE_C)
-#   define nh5tcopy_c         FC_FUNC_(h5tcopy_c, H5TCOPY_C)
-#   define nh5tequal_c        FC_FUNC_(h5tequal_c, H5TEQUAL_C)
-#   define nh5tget_class_c    FC_FUNC_(h5tget_class_c, H5TGET_CLASS_C)
-#   define nh5tget_order_c    FC_FUNC_(h5tget_order_c, H5TGET_ORDER_C)
-#   define nh5tset_order_c    FC_FUNC_(h5tset_order_c, H5TSET_ORDER_C)
-#   define nh5tget_size_c     FC_FUNC_(h5tget_size_c, H5TGET_SIZE_C)
-#   define nh5tset_size_c     FC_FUNC_(h5tset_size_c, H5TSET_SIZE_C)
-#   define nh5tget_precision_c     FC_FUNC_(h5tget_precision_c, H5TGET_PRECISION_C)
-#   define nh5tset_precision_c     FC_FUNC_(h5tset_precision_c, H5TSET_PRECISION_C)
-#   define nh5tget_offset_c        FC_FUNC_(h5tget_offset_c, H5TGET_OFFSET_C)
-#   define nh5tset_offset_c        FC_FUNC_(h5tset_offset_c, H5TSET_OFFSET_C)
-#   define nh5tget_pad_c        FC_FUNC_(h5tget_pad_c, H5TGET_PAD_C)
-#   define nh5tset_pad_c        FC_FUNC_(h5tset_pad_c, H5TSET_PAD_C)
-#   define nh5tget_sign_c       FC_FUNC_(h5tget_sign_c, H5TGET_SIGN_C)
-#   define nh5tset_sign_c       FC_FUNC_(h5tset_sign_c, H5TSET_SIGN_C)
-#   define nh5tget_fields_c       FC_FUNC_(h5tget_fields_c, H5TGET_FIELDS_C)
-#   define nh5tset_fields_c       FC_FUNC_(h5tset_fields_c, H5TSET_FIELDS_C)
-#   define nh5tget_ebias_c     FC_FUNC_(h5tget_ebias_c, H5TGET_EBIAS_C)
-#   define nh5tset_ebias_c     FC_FUNC_(h5tset_ebias_c, H5TSET_EBIAS_C)
-#   define nh5tget_norm_c     FC_FUNC_(h5tget_norm_c, H5TGET_NORM_C)
-#   define nh5tset_norm_c     FC_FUNC_(h5tset_norm_c, H5TSET_NORM_C)
-#   define nh5tget_inpad_c        FC_FUNC_(h5tget_inpad_c, H5TGET_INPAD_C)
-#   define nh5tset_inpad_c        FC_FUNC_(h5tset_inpad_c, H5TSET_INPAD_C)
-#   define nh5tget_cset_c        FC_FUNC_(h5tget_cset_c, H5TGET_CSET_C)
-#   define nh5tset_cset_c        FC_FUNC_(h5tset_cset_c, H5TSET_CSET_C)
-#   define nh5tget_strpad_c        FC_FUNC_(h5tget_strpad_c, H5TGET_STRPAD_C)
-#   define nh5tset_strpad_c        FC_FUNC_(h5tset_strpad_c, H5TSET_STRPAD_C)
-#   define nh5tget_nmembers_c        FC_FUNC_(h5tget_nmembers_c, H5TGET_NMEMBERS_C)
-#   define nh5tget_member_name_c        FC_FUNC_(h5tget_member_name_c, H5TGET_MEMBER_NAME_C)
-#   define nh5tget_member_offset_c        FC_FUNC_(h5tget_member_offset_c, H5TGET_MEMBER_OFFSET_C)
-#   define nh5tget_member_dims_c        FC_FUNC_(h5tget_member_dims_c, H5TGET_MEMBER_DIMS_C)
-#   define nh5tget_member_type_c        FC_FUNC_(h5tget_member_type_c, H5TGET_MEMBER_TYPE_C)
-#   define nh5tget_member_index_c        FC_FUNC_(h5tget_member_index_c, H5TGET_MEMBER_INDEX_C)
-#   define nh5tinsert_c        FC_FUNC_(h5tinsert_c, H5TINSERT_C)
-#   define nh5tcreate_c        FC_FUNC_(h5tcreate_c, H5TCREATE_C)
-#   define nh5tpack_c                   FC_FUNC_(h5tpack_c, H5TPACK_C)
-#   define nh5tinsert_array_c           FC_FUNC_(h5tinsert_array_c, H5TINSERT_ARRAY_C)
-#   define nh5tinsert_array_c2           FC_FUNC_(h5tinsert_array_c2, H5TINSERT_ARRAY_C2)
-#   define nh5tenum_create_c             FC_FUNC_(h5tenum_create_c, H5TENUM_CREATE_C)
-#   define nh5tenum_insert_c             FC_FUNC_(h5tenum_insert_c, H5TENUM_INSERT_C)
-#   define nh5tenum_nameof_c             FC_FUNC_(h5tenum_nameof_c, H5TENUM_NAMEOF_C)
-#   define nh5tenum_valueof_c             FC_FUNC_(h5tenum_valueof_c, H5TENUM_VALUEOF_C)
-#   define nh5tget_member_value_c         FC_FUNC_(h5tget_member_value_c, H5TGET_MEMBER_VALUE_C)
-#   define nh5tset_tag_c                  FC_FUNC_(h5tset_tag_c, H5TSET_TAG_C)
-#   define nh5tget_tag_c                  FC_FUNC_(h5tget_tag_c, H5TGET_TAG_C)
-#   define nh5tarray_create_c             FC_FUNC_(h5tarray_create_c, H5TARRAY_CREATE_C)
-#   define nh5tget_array_ndims_c          FC_FUNC_(h5tget_array_ndims_c, H5TGET_ARRAY_NDIMS_C)
-#   define nh5tget_array_dims_c          FC_FUNC_(h5tget_array_dims_c, H5TGET_ARRAY_DIMS_C)
-#   define nh5tget_super_c               FC_FUNC_(h5tget_super_c, H5TGET_SUPER_C)
-#   define nh5tvlen_create_c               FC_FUNC_(h5tvlen_create_c, H5TVLEN_CREATE_C)
-#   define nh5tis_variable_str_c         FC_FUNC_(h5tis_variable_str_c, H5TIS_VARIABLE_STR_C)
-#   define nh5tget_member_class_c         FC_FUNC_(h5tget_member_class_c, H5TGET_MEMBER_CLASS_C)
+#   define nh5topen_c         H5_FC_FUNC_(h5topen_c, H5TOPEN_C)
+#   define nh5tcommit_c       H5_FC_FUNC_(h5tcommit_c, H5TCOMMIT_C)
+#   define nh5tcommitted_c    H5_FC_FUNC_(h5tcommitted_c, H5TCOMMITTED_C)
+#   define nh5tclose_c        H5_FC_FUNC_(h5tclose_c, H5TCLOSE_C)
+#   define nh5tcopy_c         H5_FC_FUNC_(h5tcopy_c, H5TCOPY_C)
+#   define nh5tequal_c        H5_FC_FUNC_(h5tequal_c, H5TEQUAL_C)
+#   define nh5tget_class_c    H5_FC_FUNC_(h5tget_class_c, H5TGET_CLASS_C)
+#   define nh5tget_order_c    H5_FC_FUNC_(h5tget_order_c, H5TGET_ORDER_C)
+#   define nh5tset_order_c    H5_FC_FUNC_(h5tset_order_c, H5TSET_ORDER_C)
+#   define nh5tget_size_c     H5_FC_FUNC_(h5tget_size_c, H5TGET_SIZE_C)
+#   define nh5tset_size_c     H5_FC_FUNC_(h5tset_size_c, H5TSET_SIZE_C)
+#   define nh5tget_precision_c     H5_FC_FUNC_(h5tget_precision_c, H5TGET_PRECISION_C)
+#   define nh5tset_precision_c     H5_FC_FUNC_(h5tset_precision_c, H5TSET_PRECISION_C)
+#   define nh5tget_offset_c        H5_FC_FUNC_(h5tget_offset_c, H5TGET_OFFSET_C)
+#   define nh5tset_offset_c        H5_FC_FUNC_(h5tset_offset_c, H5TSET_OFFSET_C)
+#   define nh5tget_pad_c        H5_FC_FUNC_(h5tget_pad_c, H5TGET_PAD_C)
+#   define nh5tset_pad_c        H5_FC_FUNC_(h5tset_pad_c, H5TSET_PAD_C)
+#   define nh5tget_sign_c       H5_FC_FUNC_(h5tget_sign_c, H5TGET_SIGN_C)
+#   define nh5tset_sign_c       H5_FC_FUNC_(h5tset_sign_c, H5TSET_SIGN_C)
+#   define nh5tget_fields_c       H5_FC_FUNC_(h5tget_fields_c, H5TGET_FIELDS_C)
+#   define nh5tset_fields_c       H5_FC_FUNC_(h5tset_fields_c, H5TSET_FIELDS_C)
+#   define nh5tget_ebias_c     H5_FC_FUNC_(h5tget_ebias_c, H5TGET_EBIAS_C)
+#   define nh5tset_ebias_c     H5_FC_FUNC_(h5tset_ebias_c, H5TSET_EBIAS_C)
+#   define nh5tget_norm_c     H5_FC_FUNC_(h5tget_norm_c, H5TGET_NORM_C)
+#   define nh5tset_norm_c     H5_FC_FUNC_(h5tset_norm_c, H5TSET_NORM_C)
+#   define nh5tget_inpad_c        H5_FC_FUNC_(h5tget_inpad_c, H5TGET_INPAD_C)
+#   define nh5tset_inpad_c        H5_FC_FUNC_(h5tset_inpad_c, H5TSET_INPAD_C)
+#   define nh5tget_cset_c        H5_FC_FUNC_(h5tget_cset_c, H5TGET_CSET_C)
+#   define nh5tset_cset_c        H5_FC_FUNC_(h5tset_cset_c, H5TSET_CSET_C)
+#   define nh5tget_strpad_c        H5_FC_FUNC_(h5tget_strpad_c, H5TGET_STRPAD_C)
+#   define nh5tset_strpad_c        H5_FC_FUNC_(h5tset_strpad_c, H5TSET_STRPAD_C)
+#   define nh5tget_nmembers_c        H5_FC_FUNC_(h5tget_nmembers_c, H5TGET_NMEMBERS_C)
+#   define nh5tget_member_name_c        H5_FC_FUNC_(h5tget_member_name_c, H5TGET_MEMBER_NAME_C)
+#   define nh5tget_member_offset_c        H5_FC_FUNC_(h5tget_member_offset_c, H5TGET_MEMBER_OFFSET_C)
+#   define nh5tget_member_dims_c        H5_FC_FUNC_(h5tget_member_dims_c, H5TGET_MEMBER_DIMS_C)
+#   define nh5tget_member_type_c        H5_FC_FUNC_(h5tget_member_type_c, H5TGET_MEMBER_TYPE_C)
+#   define nh5tget_member_index_c        H5_FC_FUNC_(h5tget_member_index_c, H5TGET_MEMBER_INDEX_C)
+#   define nh5tinsert_c        H5_FC_FUNC_(h5tinsert_c, H5TINSERT_C)
+#   define nh5tcreate_c        H5_FC_FUNC_(h5tcreate_c, H5TCREATE_C)
+#   define nh5tpack_c                   H5_FC_FUNC_(h5tpack_c, H5TPACK_C)
+#   define nh5tinsert_array_c           H5_FC_FUNC_(h5tinsert_array_c, H5TINSERT_ARRAY_C)
+#   define nh5tinsert_array_c2           H5_FC_FUNC_(h5tinsert_array_c2, H5TINSERT_ARRAY_C2)
+#   define nh5tenum_create_c             H5_FC_FUNC_(h5tenum_create_c, H5TENUM_CREATE_C)
+#   define nh5tenum_insert_c             H5_FC_FUNC_(h5tenum_insert_c, H5TENUM_INSERT_C)
+#   define nh5tenum_nameof_c             H5_FC_FUNC_(h5tenum_nameof_c, H5TENUM_NAMEOF_C)
+#   define nh5tenum_valueof_c             H5_FC_FUNC_(h5tenum_valueof_c, H5TENUM_VALUEOF_C)
+#   define nh5tget_member_value_c         H5_FC_FUNC_(h5tget_member_value_c, H5TGET_MEMBER_VALUE_C)
+#   define nh5tset_tag_c                  H5_FC_FUNC_(h5tset_tag_c, H5TSET_TAG_C)
+#   define nh5tget_tag_c                  H5_FC_FUNC_(h5tget_tag_c, H5TGET_TAG_C)
+#   define nh5tarray_create_c             H5_FC_FUNC_(h5tarray_create_c, H5TARRAY_CREATE_C)
+#   define nh5tget_array_ndims_c          H5_FC_FUNC_(h5tget_array_ndims_c, H5TGET_ARRAY_NDIMS_C)
+#   define nh5tget_array_dims_c          H5_FC_FUNC_(h5tget_array_dims_c, H5TGET_ARRAY_DIMS_C)
+#   define nh5tget_super_c               H5_FC_FUNC_(h5tget_super_c, H5TGET_SUPER_C)
+#   define nh5tvlen_create_c               H5_FC_FUNC_(h5tvlen_create_c, H5TVLEN_CREATE_C)
+#   define nh5tis_variable_str_c         H5_FC_FUNC_(h5tis_variable_str_c, H5TIS_VARIABLE_STR_C)
+#   define nh5tget_member_class_c         H5_FC_FUNC_(h5tget_member_class_c, H5TGET_MEMBER_CLASS_C)
 
 
 H5_FCDLL int_f nh5tcreate_c(int_f *class, size_t_f *size, hid_t_f *type_id);
@@ -364,111 +364,111 @@ H5_FCDLL int_f nh5tget_member_class_c ( hid_t_f *type_id ,  int_f *member_no, in
 /* 
  * Functions from H5Pf.c
  */
-#   define nh5pcreate_c       FC_FUNC_(h5pcreate_c, H5PCREATE_C)
-#   define nh5pclose_c        FC_FUNC_(h5pclose_c, H5PCLOSE_C)
-#   define nh5pcopy_c         FC_FUNC_(h5pcopy_c, H5PCOPY_C)
-#   define nh5pequal_c         FC_FUNC_(h5pequal_c, H5PEQUAL_C)
-#   define nh5pget_class_c    FC_FUNC_(h5pget_class_c, H5PGET_CLASS_C)
-#   define nh5pset_deflate_c  FC_FUNC_(h5pset_deflate_c, H5PSET_DEFLATE_C)
-#   define nh5pset_preserve_c  FC_FUNC_(h5pset_preserve_c, H5PSET_PRESERVE_C)
-#   define nh5pget_preserve_c  FC_FUNC_(h5pget_preserve_c, H5PGET_PRESERVE_C)
-#   define nh5pset_chunk_c    FC_FUNC_(h5pset_chunk_c, H5PSET_CHUNK_C)
-#   define nh5pget_chunk_c    FC_FUNC_(h5pget_chunk_c, H5PGET_CHUNK_C)
-#   define nh5pset_fill_valuec_c FC_FUNC_(h5pset_fill_valuec_c, H5PSET_FILL_VALUEC_C)
-#   define nh5pset_fill_value_c FC_FUNC_(h5pset_fill_value_c, H5PSET_FILL_VALUE_C)
-#   define nh5pget_fill_valuec_c FC_FUNC_(h5pget_fill_valuec_c, H5PGET_FILL_VALUEC_C)
-#   define nh5pget_fill_value_c FC_FUNC_(h5pget_fill_value_c, H5PGET_FILL_VALUE_C)
-#   define nh5pget_version_c    FC_FUNC_(h5pget_version_c, H5PGET_VERSION_C)
-#   define nh5pget_userblock_c    FC_FUNC_(h5pget_userblock_c, H5PGET_USERBLOCK_C)
-#   define nh5pset_userblock_c    FC_FUNC_(h5pset_userblock_c, H5PSET_USERBLOCK_C)
-#   define nh5pset_sizes_c        FC_FUNC_(h5pset_sizes_c, H5PSET_SIZES_C)
-#   define nh5pget_sizes_c         FC_FUNC_(h5pget_sizes_c, H5PGET_SIZES_C)
-#   define nh5pget_sym_k_c         FC_FUNC_(h5pget_sym_k_c, H5PGET_SYM_K_C)
-#   define nh5pset_sym_k_c         FC_FUNC_(h5pset_sym_k_c, H5PSET_SYM_K_C)
-#   define nh5pget_istore_k_c         FC_FUNC_(h5pget_istore_k_c, H5PGET_ISTORE_K_C)
-#   define nh5pset_istore_k_c         FC_FUNC_(h5pset_istore_k_c, H5PSET_ISTORE_K_C)
-#   define nh5pget_driver_c         FC_FUNC_(h5pget_driver_c, H5PGET_DRIVER_C)
-#   define nh5pset_fapl_stdio_c         FC_FUNC_(h5pset_fapl_stdio_c, H5PSET_FAPL_STDIO_C)
-#   define nh5pget_fapl_stdio_c         FC_FUNC_(h5pget_fapl_stdio_c, H5PGET_FAPL_STDIO_C)
-#   define nh5pset_fapl_sec2_c         FC_FUNC_(h5pset_fapl_sec2_c, H5PSET_FAPL_SEC2_C)
-#   define nh5pget_fapl_sec2_c         FC_FUNC_(h5pget_fapl_sec2_c, H5PGET_FAPL_SEC2_C)
-#   define nh5pset_alignment_c         FC_FUNC_(h5pset_alignment_c, H5PSET_ALIGNMENT_C)
-#   define nh5pget_alignment_c         FC_FUNC_(h5pget_alignment_c, H5PGET_ALIGNMENT_C)
-#   define nh5pset_fapl_core_c         FC_FUNC_(h5pset_fapl_core_c, H5PSET_FAPL_CORE_C)
-#   define nh5pget_fapl_core_c         FC_FUNC_(h5pget_fapl_core_c, H5PGET_FAPL_CORE_C)
-#   define nh5pset_fapl_family_c         FC_FUNC_(h5pset_fapl_family_c, H5PSET_FAPL_FAMILY_C)
-#   define nh5pget_fapl_family_c         FC_FUNC_(h5pget_fapl_family_c, H5PGET_FAPL_FAMILY_C)
-#   define nh5pset_cache_c         FC_FUNC_(h5pset_cache_c, H5PSET_CACHE_C)
-#   define nh5pget_cache_c         FC_FUNC_(h5pget_cache_c, H5PGET_CACHE_C)
-#   define nh5pset_fapl_split_c         FC_FUNC_(h5pset_fapl_split_c, H5PSET_FAPL_SPLIT_C)
-#   define nh5pget_fapl_split_c         FC_FUNC_(h5pget_fapl_split_c, H5PGET_FAPL_SPLIT_C)
-#   define nh5pset_gc_references_c         FC_FUNC_(h5pset_gc_references_c, H5PSET_GC_REFERENCES_C)
-#   define nh5pget_gc_references_c         FC_FUNC_(h5pget_gc_references_c, H5PGET_GC_REFERENCES_C)
-#   define nh5pset_layout_c         FC_FUNC_(h5pset_layout_c, H5PSET_LAYOUT_C)
-#   define nh5pget_layout_c         FC_FUNC_(h5pget_layout_c, H5PGET_LAYOUT_C)
-#   define nh5pset_filter_c         FC_FUNC_(h5pset_filter_c, H5PSET_FILTER_C)
-#   define nh5premove_filter_c         FC_FUNC_(h5premove_filter_c, H5PREMOVE_FILTER_C)
-#   define nh5pmodify_filter_c         FC_FUNC_(h5pmodify_filter_c, H5PMODIFY_FILTER_C)
-#   define nh5pget_nfilters_c         FC_FUNC_(h5pget_nfilters_c, H5PGET_NFILTERS_C)
-#   define nh5pget_filter_c         FC_FUNC_(h5pget_filter_c, H5PGET_FILTER_C)
-#   define nh5pget_filter_by_id_c         FC_FUNC_(h5pget_filter_by_id_c, H5PGET_FILTER_BY_ID_C)
-#   define nh5pset_external_c         FC_FUNC_(h5pset_external_c, H5PSET_EXTERNAL_C)
-#   define nh5pget_external_count_c         FC_FUNC_(h5pget_external_count_c, H5PGET_EXTERNAL_COUNT_C)
-#   define nh5pget_external_c         FC_FUNC_(h5pget_external_c, H5PGET_EXTERNAL_C)
-#   define nh5pget_btree_ratios_c         FC_FUNC_(h5pget_btree_ratios_c, H5PGET_BTREE_RATIOS_C)
-#   define nh5pset_btree_ratios_c         FC_FUNC_(h5pset_btree_ratios_c, H5PSET_BTREE_RATIOS_C)
-#   define nh5pset_fapl_mpio_c         FC_FUNC_(h5pset_fapl_mpio_c, H5PSET_FAPL_MPIO_C)
-#   define nh5pget_fapl_mpio_c         FC_FUNC_(h5pget_fapl_mpio_c, H5PGET_FAPL_MPIO_C)
-#   define nh5pset_fapl_mpiposix_c     FC_FUNC_(h5pset_fapl_mpiposix_c, H5PSET_FAPL_MPIPOSIX_C)
-#   define nh5pget_fapl_mpiposix_c     FC_FUNC_(h5pget_fapl_mpiposix_c, H5PGET_FAPL_MPIPOSIX_C)
-#   define nh5pset_dxpl_mpio_c        FC_FUNC_(h5pset_dxpl_mpio_c, H5PSET_DXPL_MPIO_C)
-#   define nh5pget_dxpl_mpio_c        FC_FUNC_(h5pget_dxpl_mpio_c, H5PGET_DXPL_MPIO_C)
-#   define nh5pget_fclose_degree_c    FC_FUNC_(h5pget_fclose_degree_c, H5PGET_FCLOSE_DEGREE_C)
-#   define nh5pset_fclose_degree_c    FC_FUNC_(h5pset_fclose_degree_c, H5PSET_FCLOSE_DEGREE_C)
-#   define nh5pset_buffer_c    FC_FUNC_(h5pset_buffer_c, H5PSET_BUFFER_C)
-#   define nh5pget_buffer_c    FC_FUNC_(h5pget_buffer_c, H5PGET_BUFFER_C)
-#   define nh5pfill_value_defined_c    FC_FUNC_(h5pfill_value_defined_c, H5PFILL_VALUE_DEFINED_C)
-#   define nh5pset_alloc_time_c    FC_FUNC_(h5pset_alloc_time_c, H5PSET_ALLOC_TIME_C)
-#   define nh5pget_alloc_time_c    FC_FUNC_(h5pget_alloc_time_c, H5PGET_ALLOC_TIME_C)
-#   define nh5pset_fill_time_c    FC_FUNC_(h5pset_fill_time_c, H5PSET_FILL_TIME_C)
-#   define nh5pget_fill_time_c    FC_FUNC_(h5pget_fill_time_c, H5PGET_FILL_TIME_C)
-#   define nh5pset_meta_block_size_c    FC_FUNC_(h5pset_meta_block_size_c, H5PSET_META_BLOCK_SIZE_C)
-#   define nh5pget_meta_block_size_c    FC_FUNC_(h5pget_meta_block_size_c, H5PGET_META_BLOCK_SIZE_C)
-#   define nh5pset_sieve_buf_size_c    FC_FUNC_(h5pset_sieve_buf_size_c, H5PSET_SIEVE_BUF_SIZE_C)
-#   define nh5pget_sieve_buf_size_c    FC_FUNC_(h5pget_sieve_buf_size_c, H5PGET_SIEVE_BUF_SIZE_C)
-#   define nh5pset_hyper_vector_size_c    FC_FUNC_(h5pset_hyper_vector_size_c, H5PSET_HYPER_VECTOR_SIZE_C)
-#   define nh5pget_hyper_vector_size_c    FC_FUNC_(h5pget_hyper_vector_size_c, H5PGET_HYPER_VECTOR_SIZE_C)
-#   define nh5pset_small_data_block_size_c    FC_FUNC_(h5pset_small_data_block_size_c, H5PSET_SMALL_DATA_BLOCK_SIZE_C)
-#   define nh5pget_small_data_block_size_c    FC_FUNC_(h5pget_small_data_block_size_c, H5PGET_SMALL_DATA_BLOCK_SIZE_C)
-#   define nh5pcreate_class_c             FC_FUNC_(h5pcreate_class_c, H5PCREATE_CLASS_C)
-#   define nh5pregister_c                 FC_FUNC_(h5pregister_c, H5PREGISTER_C)
-#   define nh5pregisterc_c                FC_FUNC_(h5pregisterc_c, H5PREGISTERC_C)
-#   define nh5pinsert_c                   FC_FUNC_(h5pinsert_c, H5PINSERT_C)
-#   define nh5pinsertc_c                  FC_FUNC_(h5pinsertc_c, H5PINSERTC_C)
-#   define nh5pset_c                      FC_FUNC_(h5pset_c, H5PSET_C)
-#   define nh5psetc_c                     FC_FUNC_(h5psetc_c, H5PSETC_C)
-#   define nh5pget_c                      FC_FUNC_(h5pget_c, H5PGET_C)
-#   define nh5pgetc_c                     FC_FUNC_(h5pgetc_c, H5PGETC_C)
-#   define nh5pexist_c                    FC_FUNC_(h5pexist_c, H5PEXIST_C)
-#   define nh5pget_size_c                 FC_FUNC_(h5pget_size_c, H5PGET_SIZE_C)
-#   define nh5pget_nprops_c               FC_FUNC_(h5pget_nprops_c, H5PGET_NPROPS_C)
-#   define nh5pget_class_parent_c         FC_FUNC_(h5pget_class_parent_c, H5PGET_CLASS_PARENT_C)
-#   define nh5pisa_class_c                FC_FUNC_(h5pisa_class_c, H5PISA_CLASS_C)
-#   define nh5pcopy_prop_c                FC_FUNC_(h5pcopy_prop_c, H5PCOPY_PROP_C)
-#   define nh5premove_c                   FC_FUNC_(h5premove_c, H5PREMOVE_C)
-#   define nh5punregister_c               FC_FUNC_(h5punregister_c, H5PUNREGISTER_C)
-#   define nh5pclose_class_c              FC_FUNC_(h5pclose_class_c, H5PCLOSE_CLASS_C)
-#   define nh5pget_class_name_c           FC_FUNC_(h5pget_class_name_c, H5PGET_CLASS_NAME_C)
-#   define nh5pset_shuffle_c               FC_FUNC_(h5pset_shuffle_c, H5PSET_SHUFFLE_C)
-#   define nh5pset_fletcher32_c           FC_FUNC_(h5pset_fletcher32_c, H5PSET_FLETCHER32_C)
-#   define nh5pset_edc_check_c            FC_FUNC_(h5pset_edc_check_c, H5PSET_EDC_CHECK_C)
-#   define nh5pget_edc_check_c            FC_FUNC_(h5pget_edc_check_c, H5PGET_EDC_CHECK_C)
-#   define nh5pset_family_offset_c       FC_FUNC_(h5pset_family_offset_c, H5PSET_FAMILY_OFFSET_C)       
-#   define nh5pget_fapl_multi_c          FC_FUNC_(h5pget_fapl_multi_c, H5PGET_FAPL_MULTI_C)
-#   define nh5pset_fapl_multi_c          FC_FUNC_(h5pset_fapl_multi_c, H5PSET_FAPL_MULTI_C)
-#   define nh5pset_fapl_multi_sc          FC_FUNC_(h5pset_fapl_multi_sc, H5PSET_FAPL_MULTI_SC)
-#   define nh5pset_szip_c                 FC_FUNC_(h5pset_szip_c, H5PSET_SZIP_C)
-#   define nh5pall_filters_avail_c        FC_FUNC_(h5pall_filters_avail_c, H5PALL_FILTERS_AVAIL_C)
+#   define nh5pcreate_c       H5_FC_FUNC_(h5pcreate_c, H5PCREATE_C)
+#   define nh5pclose_c        H5_FC_FUNC_(h5pclose_c, H5PCLOSE_C)
+#   define nh5pcopy_c         H5_FC_FUNC_(h5pcopy_c, H5PCOPY_C)
+#   define nh5pequal_c         H5_FC_FUNC_(h5pequal_c, H5PEQUAL_C)
+#   define nh5pget_class_c    H5_FC_FUNC_(h5pget_class_c, H5PGET_CLASS_C)
+#   define nh5pset_deflate_c  H5_FC_FUNC_(h5pset_deflate_c, H5PSET_DEFLATE_C)
+#   define nh5pset_preserve_c  H5_FC_FUNC_(h5pset_preserve_c, H5PSET_PRESERVE_C)
+#   define nh5pget_preserve_c  H5_FC_FUNC_(h5pget_preserve_c, H5PGET_PRESERVE_C)
+#   define nh5pset_chunk_c    H5_FC_FUNC_(h5pset_chunk_c, H5PSET_CHUNK_C)
+#   define nh5pget_chunk_c    H5_FC_FUNC_(h5pget_chunk_c, H5PGET_CHUNK_C)
+#   define nh5pset_fill_valuec_c H5_FC_FUNC_(h5pset_fill_valuec_c, H5PSET_FILL_VALUEC_C)
+#   define nh5pset_fill_value_c H5_FC_FUNC_(h5pset_fill_value_c, H5PSET_FILL_VALUE_C)
+#   define nh5pget_fill_valuec_c H5_FC_FUNC_(h5pget_fill_valuec_c, H5PGET_FILL_VALUEC_C)
+#   define nh5pget_fill_value_c H5_FC_FUNC_(h5pget_fill_value_c, H5PGET_FILL_VALUE_C)
+#   define nh5pget_version_c    H5_FC_FUNC_(h5pget_version_c, H5PGET_VERSION_C)
+#   define nh5pget_userblock_c    H5_FC_FUNC_(h5pget_userblock_c, H5PGET_USERBLOCK_C)
+#   define nh5pset_userblock_c    H5_FC_FUNC_(h5pset_userblock_c, H5PSET_USERBLOCK_C)
+#   define nh5pset_sizes_c        H5_FC_FUNC_(h5pset_sizes_c, H5PSET_SIZES_C)
+#   define nh5pget_sizes_c         H5_FC_FUNC_(h5pget_sizes_c, H5PGET_SIZES_C)
+#   define nh5pget_sym_k_c         H5_FC_FUNC_(h5pget_sym_k_c, H5PGET_SYM_K_C)
+#   define nh5pset_sym_k_c         H5_FC_FUNC_(h5pset_sym_k_c, H5PSET_SYM_K_C)
+#   define nh5pget_istore_k_c         H5_FC_FUNC_(h5pget_istore_k_c, H5PGET_ISTORE_K_C)
+#   define nh5pset_istore_k_c         H5_FC_FUNC_(h5pset_istore_k_c, H5PSET_ISTORE_K_C)
+#   define nh5pget_driver_c         H5_FC_FUNC_(h5pget_driver_c, H5PGET_DRIVER_C)
+#   define nh5pset_fapl_stdio_c         H5_FC_FUNC_(h5pset_fapl_stdio_c, H5PSET_FAPL_STDIO_C)
+#   define nh5pget_fapl_stdio_c         H5_FC_FUNC_(h5pget_fapl_stdio_c, H5PGET_FAPL_STDIO_C)
+#   define nh5pset_fapl_sec2_c         H5_FC_FUNC_(h5pset_fapl_sec2_c, H5PSET_FAPL_SEC2_C)
+#   define nh5pget_fapl_sec2_c         H5_FC_FUNC_(h5pget_fapl_sec2_c, H5PGET_FAPL_SEC2_C)
+#   define nh5pset_alignment_c         H5_FC_FUNC_(h5pset_alignment_c, H5PSET_ALIGNMENT_C)
+#   define nh5pget_alignment_c         H5_FC_FUNC_(h5pget_alignment_c, H5PGET_ALIGNMENT_C)
+#   define nh5pset_fapl_core_c         H5_FC_FUNC_(h5pset_fapl_core_c, H5PSET_FAPL_CORE_C)
+#   define nh5pget_fapl_core_c         H5_FC_FUNC_(h5pget_fapl_core_c, H5PGET_FAPL_CORE_C)
+#   define nh5pset_fapl_family_c         H5_FC_FUNC_(h5pset_fapl_family_c, H5PSET_FAPL_FAMILY_C)
+#   define nh5pget_fapl_family_c         H5_FC_FUNC_(h5pget_fapl_family_c, H5PGET_FAPL_FAMILY_C)
+#   define nh5pset_cache_c         H5_FC_FUNC_(h5pset_cache_c, H5PSET_CACHE_C)
+#   define nh5pget_cache_c         H5_FC_FUNC_(h5pget_cache_c, H5PGET_CACHE_C)
+#   define nh5pset_fapl_split_c         H5_FC_FUNC_(h5pset_fapl_split_c, H5PSET_FAPL_SPLIT_C)
+#   define nh5pget_fapl_split_c         H5_FC_FUNC_(h5pget_fapl_split_c, H5PGET_FAPL_SPLIT_C)
+#   define nh5pset_gc_references_c         H5_FC_FUNC_(h5pset_gc_references_c, H5PSET_GC_REFERENCES_C)
+#   define nh5pget_gc_references_c         H5_FC_FUNC_(h5pget_gc_references_c, H5PGET_GC_REFERENCES_C)
+#   define nh5pset_layout_c         H5_FC_FUNC_(h5pset_layout_c, H5PSET_LAYOUT_C)
+#   define nh5pget_layout_c         H5_FC_FUNC_(h5pget_layout_c, H5PGET_LAYOUT_C)
+#   define nh5pset_filter_c         H5_FC_FUNC_(h5pset_filter_c, H5PSET_FILTER_C)
+#   define nh5premove_filter_c         H5_FC_FUNC_(h5premove_filter_c, H5PREMOVE_FILTER_C)
+#   define nh5pmodify_filter_c         H5_FC_FUNC_(h5pmodify_filter_c, H5PMODIFY_FILTER_C)
+#   define nh5pget_nfilters_c         H5_FC_FUNC_(h5pget_nfilters_c, H5PGET_NFILTERS_C)
+#   define nh5pget_filter_c         H5_FC_FUNC_(h5pget_filter_c, H5PGET_FILTER_C)
+#   define nh5pget_filter_by_id_c         H5_FC_FUNC_(h5pget_filter_by_id_c, H5PGET_FILTER_BY_ID_C)
+#   define nh5pset_external_c         H5_FC_FUNC_(h5pset_external_c, H5PSET_EXTERNAL_C)
+#   define nh5pget_external_count_c         H5_FC_FUNC_(h5pget_external_count_c, H5PGET_EXTERNAL_COUNT_C)
+#   define nh5pget_external_c         H5_FC_FUNC_(h5pget_external_c, H5PGET_EXTERNAL_C)
+#   define nh5pget_btree_ratios_c         H5_FC_FUNC_(h5pget_btree_ratios_c, H5PGET_BTREE_RATIOS_C)
+#   define nh5pset_btree_ratios_c         H5_FC_FUNC_(h5pset_btree_ratios_c, H5PSET_BTREE_RATIOS_C)
+#   define nh5pset_fapl_mpio_c         H5_FC_FUNC_(h5pset_fapl_mpio_c, H5PSET_FAPL_MPIO_C)
+#   define nh5pget_fapl_mpio_c         H5_FC_FUNC_(h5pget_fapl_mpio_c, H5PGET_FAPL_MPIO_C)
+#   define nh5pset_fapl_mpiposix_c     H5_FC_FUNC_(h5pset_fapl_mpiposix_c, H5PSET_FAPL_MPIPOSIX_C)
+#   define nh5pget_fapl_mpiposix_c     H5_FC_FUNC_(h5pget_fapl_mpiposix_c, H5PGET_FAPL_MPIPOSIX_C)
+#   define nh5pset_dxpl_mpio_c        H5_FC_FUNC_(h5pset_dxpl_mpio_c, H5PSET_DXPL_MPIO_C)
+#   define nh5pget_dxpl_mpio_c        H5_FC_FUNC_(h5pget_dxpl_mpio_c, H5PGET_DXPL_MPIO_C)
+#   define nh5pget_fclose_degree_c    H5_FC_FUNC_(h5pget_fclose_degree_c, H5PGET_FCLOSE_DEGREE_C)
+#   define nh5pset_fclose_degree_c    H5_FC_FUNC_(h5pset_fclose_degree_c, H5PSET_FCLOSE_DEGREE_C)
+#   define nh5pset_buffer_c    H5_FC_FUNC_(h5pset_buffer_c, H5PSET_BUFFER_C)
+#   define nh5pget_buffer_c    H5_FC_FUNC_(h5pget_buffer_c, H5PGET_BUFFER_C)
+#   define nh5pfill_value_defined_c    H5_FC_FUNC_(h5pfill_value_defined_c, H5PFILL_VALUE_DEFINED_C)
+#   define nh5pset_alloc_time_c    H5_FC_FUNC_(h5pset_alloc_time_c, H5PSET_ALLOC_TIME_C)
+#   define nh5pget_alloc_time_c    H5_FC_FUNC_(h5pget_alloc_time_c, H5PGET_ALLOC_TIME_C)
+#   define nh5pset_fill_time_c    H5_FC_FUNC_(h5pset_fill_time_c, H5PSET_FILL_TIME_C)
+#   define nh5pget_fill_time_c    H5_FC_FUNC_(h5pget_fill_time_c, H5PGET_FILL_TIME_C)
+#   define nh5pset_meta_block_size_c    H5_FC_FUNC_(h5pset_meta_block_size_c, H5PSET_META_BLOCK_SIZE_C)
+#   define nh5pget_meta_block_size_c    H5_FC_FUNC_(h5pget_meta_block_size_c, H5PGET_META_BLOCK_SIZE_C)
+#   define nh5pset_sieve_buf_size_c    H5_FC_FUNC_(h5pset_sieve_buf_size_c, H5PSET_SIEVE_BUF_SIZE_C)
+#   define nh5pget_sieve_buf_size_c    H5_FC_FUNC_(h5pget_sieve_buf_size_c, H5PGET_SIEVE_BUF_SIZE_C)
+#   define nh5pset_hyper_vector_size_c    H5_FC_FUNC_(h5pset_hyper_vector_size_c, H5PSET_HYPER_VECTOR_SIZE_C)
+#   define nh5pget_hyper_vector_size_c    H5_FC_FUNC_(h5pget_hyper_vector_size_c, H5PGET_HYPER_VECTOR_SIZE_C)
+#   define nh5pset_small_data_block_size_c    H5_FC_FUNC_(h5pset_small_data_block_size_c, H5PSET_SMALL_DATA_BLOCK_SIZE_C)
+#   define nh5pget_small_data_block_size_c    H5_FC_FUNC_(h5pget_small_data_block_size_c, H5PGET_SMALL_DATA_BLOCK_SIZE_C)
+#   define nh5pcreate_class_c             H5_FC_FUNC_(h5pcreate_class_c, H5PCREATE_CLASS_C)
+#   define nh5pregister_c                 H5_FC_FUNC_(h5pregister_c, H5PREGISTER_C)
+#   define nh5pregisterc_c                H5_FC_FUNC_(h5pregisterc_c, H5PREGISTERC_C)
+#   define nh5pinsert_c                   H5_FC_FUNC_(h5pinsert_c, H5PINSERT_C)
+#   define nh5pinsertc_c                  H5_FC_FUNC_(h5pinsertc_c, H5PINSERTC_C)
+#   define nh5pset_c                      H5_FC_FUNC_(h5pset_c, H5PSET_C)
+#   define nh5psetc_c                     H5_FC_FUNC_(h5psetc_c, H5PSETC_C)
+#   define nh5pget_c                      H5_FC_FUNC_(h5pget_c, H5PGET_C)
+#   define nh5pgetc_c                     H5_FC_FUNC_(h5pgetc_c, H5PGETC_C)
+#   define nh5pexist_c                    H5_FC_FUNC_(h5pexist_c, H5PEXIST_C)
+#   define nh5pget_size_c                 H5_FC_FUNC_(h5pget_size_c, H5PGET_SIZE_C)
+#   define nh5pget_nprops_c               H5_FC_FUNC_(h5pget_nprops_c, H5PGET_NPROPS_C)
+#   define nh5pget_class_parent_c         H5_FC_FUNC_(h5pget_class_parent_c, H5PGET_CLASS_PARENT_C)
+#   define nh5pisa_class_c                H5_FC_FUNC_(h5pisa_class_c, H5PISA_CLASS_C)
+#   define nh5pcopy_prop_c                H5_FC_FUNC_(h5pcopy_prop_c, H5PCOPY_PROP_C)
+#   define nh5premove_c                   H5_FC_FUNC_(h5premove_c, H5PREMOVE_C)
+#   define nh5punregister_c               H5_FC_FUNC_(h5punregister_c, H5PUNREGISTER_C)
+#   define nh5pclose_class_c              H5_FC_FUNC_(h5pclose_class_c, H5PCLOSE_CLASS_C)
+#   define nh5pget_class_name_c           H5_FC_FUNC_(h5pget_class_name_c, H5PGET_CLASS_NAME_C)
+#   define nh5pset_shuffle_c               H5_FC_FUNC_(h5pset_shuffle_c, H5PSET_SHUFFLE_C)
+#   define nh5pset_fletcher32_c           H5_FC_FUNC_(h5pset_fletcher32_c, H5PSET_FLETCHER32_C)
+#   define nh5pset_edc_check_c            H5_FC_FUNC_(h5pset_edc_check_c, H5PSET_EDC_CHECK_C)
+#   define nh5pget_edc_check_c            H5_FC_FUNC_(h5pget_edc_check_c, H5PGET_EDC_CHECK_C)
+#   define nh5pset_family_offset_c       H5_FC_FUNC_(h5pset_family_offset_c, H5PSET_FAMILY_OFFSET_C)       
+#   define nh5pget_fapl_multi_c          H5_FC_FUNC_(h5pget_fapl_multi_c, H5PGET_FAPL_MULTI_C)
+#   define nh5pset_fapl_multi_c          H5_FC_FUNC_(h5pset_fapl_multi_c, H5PSET_FAPL_MULTI_C)
+#   define nh5pset_fapl_multi_sc          H5_FC_FUNC_(h5pset_fapl_multi_sc, H5PSET_FAPL_MULTI_SC)
+#   define nh5pset_szip_c                 H5_FC_FUNC_(h5pset_szip_c, H5PSET_SZIP_C)
+#   define nh5pall_filters_avail_c        H5_FC_FUNC_(h5pall_filters_avail_c, H5PALL_FILTERS_AVAIL_C)
 
 
 H5_FCDLL int_f nh5pcreate_c ( hid_t_f *class, hid_t_f *prp_id );
@@ -581,12 +581,12 @@ H5_FCDLL int_f nh5pfill_value_defined_c ( hid_t_f *prp_id , int_f *flag);
 /*
  * Functions frome H5Rf.c 
  */
-#   define nh5rcreate_object_c     FC_FUNC_(h5rcreate_object_c, H5RCREATE_OBJECT_C)
-#   define nh5rcreate_region_c     FC_FUNC_(h5rcreate_region_c, H5RCREATE_REGION_C)
-#   define nh5rdereference_region_c FC_FUNC_(h5rdereference_region_c, H5RDEREFERENCE_REGION_C)
-#   define nh5rdereference_object_c FC_FUNC_(h5rdereference_object_c, H5RDEREFERENCE_OBJECT_C)
-#   define nh5rget_region_region_c FC_FUNC_(h5rget_region_region_c, H5RGET_REGION_REGION_C)
-#   define nh5rget_object_type_obj_c FC_FUNC_(h5rget_object_type_obj_c, H5RGET_OBJECT_TYPE_OBJ_C)
+#   define nh5rcreate_object_c     H5_FC_FUNC_(h5rcreate_object_c, H5RCREATE_OBJECT_C)
+#   define nh5rcreate_region_c     H5_FC_FUNC_(h5rcreate_region_c, H5RCREATE_REGION_C)
+#   define nh5rdereference_region_c H5_FC_FUNC_(h5rdereference_region_c, H5RDEREFERENCE_REGION_C)
+#   define nh5rdereference_object_c H5_FC_FUNC_(h5rdereference_object_c, H5RDEREFERENCE_OBJECT_C)
+#   define nh5rget_region_region_c H5_FC_FUNC_(h5rget_region_region_c, H5RGET_REGION_REGION_C)
+#   define nh5rget_object_type_obj_c H5_FC_FUNC_(h5rget_object_type_obj_c, H5RGET_OBJECT_TYPE_OBJ_C)
 
 
 H5_FCDLL int_f nh5rcreate_object_c (haddr_t_f *ref, hid_t_f *loc_id, _fcd name, int_f *namelen);
@@ -599,12 +599,12 @@ H5_FCDLL int_f nh5rget_object_type_obj_c (hid_t_f *dset_id, haddr_t_f *ref, int_
 /*
  * Functions from H5If.c
  */
-#  define nh5iget_type_c    FC_FUNC_(h5iget_type_c, H5IGET_TYPE_C)
-#  define nh5iget_name_c    FC_FUNC_(h5iget_name_c, H5IGET_NAME_C)
-#  define nh5iinc_ref_c     FC_FUNC_(h5iinc_ref_c, H5IINC_REF_C)
-#  define nh5idec_ref_c     FC_FUNC_(h5idec_ref_c, H5IDEC_REF_C)
-#  define nh5iget_ref_c     FC_FUNC_(h5iget_ref_c, H5IGET_REF_C)
-#  define nh5iget_file_id_c FC_FUNC_(h5iget_file_id_c, H5IGET_FILE_ID_C)
+#  define nh5iget_type_c    H5_FC_FUNC_(h5iget_type_c, H5IGET_TYPE_C)
+#  define nh5iget_name_c    H5_FC_FUNC_(h5iget_name_c, H5IGET_NAME_C)
+#  define nh5iinc_ref_c     H5_FC_FUNC_(h5iinc_ref_c, H5IINC_REF_C)
+#  define nh5idec_ref_c     H5_FC_FUNC_(h5idec_ref_c, H5IDEC_REF_C)
+#  define nh5iget_ref_c     H5_FC_FUNC_(h5iget_ref_c, H5IGET_REF_C)
+#  define nh5iget_file_id_c H5_FC_FUNC_(h5iget_file_id_c, H5IGET_FILE_ID_C)
 
 H5_FCDLL int_f nh5iget_type_c(hid_t_f *obj_id, int_f *type);
 H5_FCDLL int_f nh5iget_name_c(hid_t_f *obj_id, _fcd buf, size_t_f *buf_size, size_t_f *name_size);
@@ -616,12 +616,12 @@ H5_FCDLL int_f nh5iget_file_id_c(hid_t_f *obj_id, hid_t_f *file_id);
 /*
  * Functions from H5Ef.c 
  */
-#  define nh5eclear_c     FC_FUNC_(h5eclear_c, H5ECLEAR_C)
-#  define nh5eprint_c1    FC_FUNC_(h5eprint_c1, H5EPRINT_C1)
-#  define nh5eprint_c2    FC_FUNC_(h5eprint_c2, H5EPRINT_C2)
-#  define nh5eget_major_c FC_FUNC_(h5eget_major_c, H5EGET_MAJOR_C)
-#  define nh5eget_minor_c FC_FUNC_(h5eget_minor_c, H5EGET_MINOR_C)
-#  define nh5eset_auto_c  FC_FUNC_(h5eset_auto_c, H5ESET_AUTO_C)
+#  define nh5eclear_c     H5_FC_FUNC_(h5eclear_c, H5ECLEAR_C)
+#  define nh5eprint_c1    H5_FC_FUNC_(h5eprint_c1, H5EPRINT_C1)
+#  define nh5eprint_c2    H5_FC_FUNC_(h5eprint_c2, H5EPRINT_C2)
+#  define nh5eget_major_c H5_FC_FUNC_(h5eget_major_c, H5EGET_MAJOR_C)
+#  define nh5eget_minor_c H5_FC_FUNC_(h5eget_minor_c, H5EGET_MINOR_C)
+#  define nh5eset_auto_c  H5_FC_FUNC_(h5eset_auto_c, H5ESET_AUTO_C)
 
 
 H5_FCDLL int_f nh5eclear_c(void);
@@ -634,16 +634,16 @@ H5_FCDLL int_f nh5eset_auto_c(int_f* printflag);
 /*
  * Functions from H5f.c 
  */
-#   define nh5open_c            FC_FUNC_(h5open_c, H5OPEN_C)
-#   define nh5close_c           FC_FUNC_(h5close_c, H5CLOSE_C)
-#   define nh5init_types_c      FC_FUNC_(h5init_types_c, H5INIT_TYPES_C)
-#   define nh5close_types_c     FC_FUNC_(h5close_types_c, H5CLOSE_TYPES_C)
-#   define nh5init_flags_c      FC_FUNC_(h5init_flags_c, H5INIT_FLAGS_C)
-#   define nh5init1_flags_c     FC_FUNC_(h5init1_flags_c, H5INIT1_FLAGS_C)
-#   define nh5get_libversion_c  FC_FUNC_(h5get_libversion_c, H5GET_LIBVERSION_C)
-#   define nh5check_version_c   FC_FUNC_(h5check_version_c, H5CHECK_VERSION_C)
-#   define nh5garbage_collect_c FC_FUNC_(h5garbage_collect_c, H5GARBAGE_COLLECT_C)
-#   define nh5dont_atexit_c     FC_FUNC_(h5dont_atexit_c, H5DONT_ATEXIT_C)
+#   define nh5open_c            H5_FC_FUNC_(h5open_c, H5OPEN_C)
+#   define nh5close_c           H5_FC_FUNC_(h5close_c, H5CLOSE_C)
+#   define nh5init_types_c      H5_FC_FUNC_(h5init_types_c, H5INIT_TYPES_C)
+#   define nh5close_types_c     H5_FC_FUNC_(h5close_types_c, H5CLOSE_TYPES_C)
+#   define nh5init_flags_c      H5_FC_FUNC_(h5init_flags_c, H5INIT_FLAGS_C)
+#   define nh5init1_flags_c     H5_FC_FUNC_(h5init1_flags_c, H5INIT1_FLAGS_C)
+#   define nh5get_libversion_c  H5_FC_FUNC_(h5get_libversion_c, H5GET_LIBVERSION_C)
+#   define nh5check_version_c   H5_FC_FUNC_(h5check_version_c, H5CHECK_VERSION_C)
+#   define nh5garbage_collect_c H5_FC_FUNC_(h5garbage_collect_c, H5GARBAGE_COLLECT_C)
+#   define nh5dont_atexit_c     H5_FC_FUNC_(h5dont_atexit_c, H5DONT_ATEXIT_C)
 
 
 H5_FCDLL int_f nh5open_c(void);
@@ -663,9 +663,9 @@ H5_FCDLL int_f nh5dont_atexit_c(void);
 /*
  * Functions from H5Zf.c
  */
-#  define nh5zunregister_c    FC_FUNC_(h5zunregister_c, H5ZUNREGISTER_C)
-#  define nh5zfilter_avail_c  FC_FUNC_(h5zfilter_avail_c, H5ZFILTER_AVAIL_C)
-#  define nh5zget_filter_info_c FC_FUNC_(h5zget_filter_info_c, H5ZGET_FILTER_INFO_C)
+#  define nh5zunregister_c    H5_FC_FUNC_(h5zunregister_c, H5ZUNREGISTER_C)
+#  define nh5zfilter_avail_c  H5_FC_FUNC_(h5zfilter_avail_c, H5ZFILTER_AVAIL_C)
+#  define nh5zget_filter_info_c H5_FC_FUNC_(h5zget_filter_info_c, H5ZGET_FILTER_INFO_C)
 
 
 H5_FCDLL int_f nh5zunregister_c (int_f *filter);
diff --git a/fortran/test/t.h b/fortran/test/t.h
index 3e4fd4d..34cec34 100644
--- a/fortran/test/t.h
+++ b/fortran/test/t.h
@@ -21,9 +21,9 @@ char *h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size)
 /*
  *  Functions from t.c
  */
-#   define nh5_fixname_c              FC_FUNC_(h5_fixname_c, H5_FIXNAME_C)
-#   define nh5_cleanup_c              FC_FUNC_(h5_cleanup_c, H5_CLEANUP_C)
-#   define nh5_exit_c                 FC_FUNC_(h5_exit_c, H5_EXIT_C)
+#   define nh5_fixname_c              H5_FC_FUNC_(h5_fixname_c, H5_FIXNAME_C)
+#   define nh5_cleanup_c              H5_FC_FUNC_(h5_cleanup_c, H5_CLEANUP_C)
+#   define nh5_exit_c                 H5_FC_FUNC_(h5_exit_c, H5_EXIT_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);
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