[svn-r5931]

Purpose:
__DLL__ is a keyword in some platforms and __DLL__ is also defined as a macro for windows DLL applications.
That causes problems.
Description:
Solution:
Use H5_DLL*** to replace __DLL***__ at all header files.
Change the macro defination at H5api_adpt.h.
Platforms tested:
linux2.2.18smp, irix64, solaris 2.7 and windows 2000

1 files changed, 36 insertions, 36 deletions

diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h
index d5028b6..1daaf04 100644
--- a/src/H5Sprivate.h
+++ b/src/H5Sprivate.h
@@ -137,67 +137,67 @@ typedef struct H5S_conv_t {
 
 /* We get the declaration of H5G_entry_t from the H5Oprivate.h file */
 
-__DLL__ H5S_t *H5S_create(H5S_class_t type);
-__DLL__ H5S_t *H5S_copy(const H5S_t *src);
-__DLL__ herr_t H5S_close(H5S_t *ds);
-__DLL__ H5S_conv_t *H5S_find(const H5S_t *mem_space, const H5S_t *file_space,
+H5_DLL H5S_t *H5S_create(H5S_class_t type);
+H5_DLL H5S_t *H5S_copy(const H5S_t *src);
+H5_DLL herr_t H5S_close(H5S_t *ds);
+H5_DLL H5S_conv_t *H5S_find(const H5S_t *mem_space, const H5S_t *file_space,
                 unsigned flags);
-__DLL__ H5S_class_t H5S_get_simple_extent_type(const H5S_t *ds);
-__DLL__ hssize_t H5S_get_simple_extent_npoints(const H5S_t *ds);
-__DLL__ hsize_t H5S_get_npoints_max(const H5S_t *ds);
-__DLL__ int H5S_get_simple_extent_ndims(const H5S_t *ds);
-__DLL__ int H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[]/*out*/,
+H5_DLL H5S_class_t H5S_get_simple_extent_type(const H5S_t *ds);
+H5_DLL hssize_t H5S_get_simple_extent_npoints(const H5S_t *ds);
+H5_DLL hsize_t H5S_get_npoints_max(const H5S_t *ds);
+H5_DLL int H5S_get_simple_extent_ndims(const H5S_t *ds);
+H5_DLL int H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[]/*out*/,
 					hsize_t max_dims[]/*out*/);
-__DLL__ herr_t H5S_set_extent_simple (H5S_t *space, unsigned rank, const hsize_t *dims,
+H5_DLL herr_t H5S_set_extent_simple (H5S_t *space, unsigned rank, const hsize_t *dims,
 		       const hsize_t *max);
-__DLL__ herr_t H5S_modify(struct H5G_entry_t *ent, const H5S_t *space);
-__DLL__ H5S_t *H5S_read(struct H5G_entry_t *ent);
-__DLL__ int H5S_cmp(const H5S_t *ds1, const H5S_t *ds2);
-__DLL__ htri_t H5S_is_simple(const H5S_t *sdim);
-__DLL__ herr_t H5S_extent_release(H5S_t *space);
-__DLL__ int H5S_extend(H5S_t *space, const hsize_t *size);
-__DLL__ int H5S_set_extent(H5S_t *space, const hsize_t *size);
-__DLL__ herr_t H5S_debug(H5F_t *f, const void *_mesg, FILE *stream,
+H5_DLL herr_t H5S_modify(struct H5G_entry_t *ent, const H5S_t *space);
+H5_DLL H5S_t *H5S_read(struct H5G_entry_t *ent);
+H5_DLL int H5S_cmp(const H5S_t *ds1, const H5S_t *ds2);
+H5_DLL htri_t H5S_is_simple(const H5S_t *sdim);
+H5_DLL herr_t H5S_extent_release(H5S_t *space);
+H5_DLL int H5S_extend(H5S_t *space, const hsize_t *size);
+H5_DLL int H5S_set_extent(H5S_t *space, const hsize_t *size);
+H5_DLL herr_t H5S_debug(H5F_t *f, const void *_mesg, FILE *stream,
 			 int indent, int fwidth);
 
 /* Operations on selections */
-__DLL__ herr_t H5S_select_copy(H5S_t *dst, const H5S_t *src);
-__DLL__ herr_t H5S_select_deserialize(H5S_t *space, const uint8_t *buf);
-__DLL__ htri_t H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2);
-__DLL__ herr_t H5S_select_iterate(void *buf, hid_t type_id, H5S_t *space,
+H5_DLL herr_t H5S_select_copy(H5S_t *dst, const H5S_t *src);
+H5_DLL herr_t H5S_select_deserialize(H5S_t *space, const uint8_t *buf);
+H5_DLL htri_t H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2);
+H5_DLL herr_t H5S_select_iterate(void *buf, hid_t type_id, H5S_t *space,
 				H5D_operator_t op, void *operator_data);
-__DLL__ herr_t H5S_select_fill(void *fill, size_t fill_size,
+H5_DLL herr_t H5S_select_fill(void *fill, size_t fill_size,
                                 const H5S_t *space, void *buf);
-__DLL__ herr_t H5S_select_fscat (H5F_t *f, struct H5O_layout_t *layout,
+H5_DLL herr_t H5S_select_fscat (H5F_t *f, struct H5O_layout_t *layout,
         H5P_genplist_t *dc_plist, size_t elmt_size, const H5S_t *file_space,
         H5S_sel_iter_t *file_iter, hsize_t nelmts, hid_t dxpl_id,
         const void *_buf);
-__DLL__ hsize_t H5S_select_fgath (H5F_t *f, const struct H5O_layout_t *layout,
+H5_DLL hsize_t H5S_select_fgath (H5F_t *f, const struct H5O_layout_t *layout,
         H5P_genplist_t *dc_plist, size_t elmt_size, const H5S_t *file_space,
         H5S_sel_iter_t *file_iter, hsize_t nelmts, hid_t dxpl_id,
         void *buf);
-__DLL__ herr_t H5S_select_mscat (const void *_tscat_buf, size_t elmt_size,
+H5_DLL herr_t H5S_select_mscat (const void *_tscat_buf, size_t elmt_size,
         const H5S_t *space, H5S_sel_iter_t *iter, hsize_t nelmts,
         hid_t dxpl_id, void *_buf/*out*/);
-__DLL__ hsize_t H5S_select_mgath (const void *_buf, size_t elmt_size,
+H5_DLL hsize_t H5S_select_mgath (const void *_buf, size_t elmt_size,
         const H5S_t *space, H5S_sel_iter_t *iter, hsize_t nelmts,
         hid_t dxpl_id, void *_tgath_buf/*out*/);
-__DLL__ herr_t H5S_select_read(H5F_t *f, const struct H5O_layout_t *layout,
+H5_DLL herr_t H5S_select_read(H5F_t *f, const struct H5O_layout_t *layout,
         H5P_genplist_t *dc_plist, size_t elmt_size, const H5S_t *file_space,
         const H5S_t *mem_space, hid_t dxpl_id, void *buf/*out*/);
-__DLL__ herr_t H5S_select_write(H5F_t *f, struct H5O_layout_t *layout,
+H5_DLL herr_t H5S_select_write(H5F_t *f, struct H5O_layout_t *layout,
         H5P_genplist_t *dc_plist, size_t elmt_size, const H5S_t *file_space,
         const H5S_t *mem_space, hid_t dxpl_id, const void *buf/*out*/);
 
 /* Needed for internal use of selections in H5Fistore code */
-__DLL__ herr_t H5S_select_all(H5S_t *space, unsigned rel_prev);
-__DLL__ herr_t H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op, const hssize_t start[],
+H5_DLL herr_t H5S_select_all(H5S_t *space, unsigned rel_prev);
+H5_DLL herr_t H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op, const hssize_t start[],
                 const hsize_t *stride, const hsize_t count[],
                 const hsize_t *block);
 
 #ifdef H5_HAVE_PARALLEL
 /* MPI-IO function to read directly from app buffer to file rky980813 */
-__DLL__ herr_t H5S_mpio_spaces_read(H5F_t *f,
+H5_DLL herr_t H5S_mpio_spaces_read(H5F_t *f,
 				    const struct H5O_layout_t *layout,
                                     H5P_genplist_t *dc_plist,
 				    size_t elmt_size, const H5S_t *file_space,
@@ -205,7 +205,7 @@ __DLL__ herr_t H5S_mpio_spaces_read(H5F_t *f,
 				    void *buf/*out*/);
 
 /* MPI-IO function to write directly from app buffer to file rky980813 */
-__DLL__ herr_t H5S_mpio_spaces_write(H5F_t *f,
+H5_DLL herr_t H5S_mpio_spaces_write(H5F_t *f,
 				    struct H5O_layout_t *layout,
                                     H5P_genplist_t *dc_plist,
 				    size_t elmt_size, const H5S_t *file_space,
@@ -214,14 +214,14 @@ __DLL__ herr_t H5S_mpio_spaces_write(H5F_t *f,
 
 /* MPI-IO function to check if a direct I/O transfer is possible between
  * memory and the file */
-__DLL__ htri_t H5S_mpio_opt_possible(const H5S_t *mem_space,
+H5_DLL htri_t H5S_mpio_opt_possible(const H5S_t *mem_space,
                                      const H5S_t *file_space, const unsigned flags);
 
 #ifndef _H5S_IN_H5S_C
 /* Global vars whose value comes from environment variable */
 /* (Defined in H5S.c) */
-__DLLVAR__ hbool_t		H5S_mpi_opt_types_g;
-__DLLVAR__ hbool_t		H5S_mpi_prefer_derived_types_g;
+H5_DLLVAR hbool_t		H5S_mpi_opt_types_g;
+H5_DLLVAR hbool_t		H5S_mpi_prefer_derived_types_g;
 #endif /* _H5S_IN_H5S_C */
 
 #endif /* H5_HAVE_PARALLEL */