[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, 35 insertions, 35 deletions

diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index fe32237..20ea00b 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -135,52 +135,52 @@ typedef struct H5G_names_t {
  * Library prototypes...  These are the ones that other packages routinely
  * call.
  */
-__DLL__ herr_t H5G_register_type(int type, htri_t(*isa)(H5G_entry_t*),
+H5_DLL herr_t H5G_register_type(int type, htri_t(*isa)(H5G_entry_t*),
 				 const char *desc);
-__DLL__ H5G_entry_t *H5G_loc(hid_t loc_id);
-__DLL__ herr_t H5G_mkroot(H5F_t *f, H5G_entry_t *root_entry);
-__DLL__ H5G_entry_t *H5G_entof(H5G_t *grp);
-__DLL__ H5F_t *H5G_fileof(H5G_t *grp);
-__DLL__ H5G_t *H5G_create(H5G_entry_t *loc, const char *name,
+H5_DLL H5G_entry_t *H5G_loc(hid_t loc_id);
+H5_DLL herr_t H5G_mkroot(H5F_t *f, H5G_entry_t *root_entry);
+H5_DLL H5G_entry_t *H5G_entof(H5G_t *grp);
+H5_DLL H5F_t *H5G_fileof(H5G_t *grp);
+H5_DLL H5G_t *H5G_create(H5G_entry_t *loc, const char *name,
 			  size_t size_hint);
-__DLL__ H5G_t *H5G_open(H5G_entry_t *loc, const char *name);
-__DLL__ H5G_t *H5G_open_oid(H5G_entry_t *ent);
-__DLL__ H5G_t *H5G_reopen(H5G_t *grp);
-__DLL__ herr_t H5G_close(H5G_t *grp);
-__DLL__ H5G_t *H5G_rootof(H5F_t *f);
-__DLL__ htri_t H5G_isa(H5G_entry_t *ent);
-__DLL__ herr_t H5G_link(H5G_entry_t *cur_loc, const char *cur_name, 
+H5_DLL H5G_t *H5G_open(H5G_entry_t *loc, const char *name);
+H5_DLL H5G_t *H5G_open_oid(H5G_entry_t *ent);
+H5_DLL H5G_t *H5G_reopen(H5G_t *grp);
+H5_DLL herr_t H5G_close(H5G_t *grp);
+H5_DLL H5G_t *H5G_rootof(H5F_t *f);
+H5_DLL htri_t H5G_isa(H5G_entry_t *ent);
+H5_DLL herr_t H5G_link(H5G_entry_t *cur_loc, const char *cur_name, 
 			H5G_entry_t *new_loc, const char *new_name, 
 			H5G_link_t type, unsigned namei_flags);
-__DLL__ int H5G_get_type(H5G_entry_t *ent);
-__DLL__ herr_t H5G_get_objinfo(H5G_entry_t *loc, const char *name,
+H5_DLL int H5G_get_type(H5G_entry_t *ent);
+H5_DLL herr_t H5G_get_objinfo(H5G_entry_t *loc, const char *name,
 			       hbool_t follow_link,
 			       H5G_stat_t *statbuf/*out*/);
-__DLL__ herr_t H5G_linkval(H5G_entry_t *loc, const char *name, size_t size,
+H5_DLL herr_t H5G_linkval(H5G_entry_t *loc, const char *name, size_t size,
 			   char *buf/*out*/);
-__DLL__ herr_t H5G_set_comment(H5G_entry_t *loc, const char *name,
+H5_DLL herr_t H5G_set_comment(H5G_entry_t *loc, const char *name,
 			       const char *buf);
-__DLL__ int H5G_get_comment(H5G_entry_t *loc, const char *name,
+H5_DLL int H5G_get_comment(H5G_entry_t *loc, const char *name,
 			     size_t bufsize, char *buf);
-__DLL__ herr_t H5G_insert(H5G_entry_t *loc, const char *name,
+H5_DLL herr_t H5G_insert(H5G_entry_t *loc, const char *name,
 			  H5G_entry_t *ent);
-__DLL__ herr_t H5G_move(H5G_entry_t *src_loc, const char *src_name,
+H5_DLL herr_t H5G_move(H5G_entry_t *src_loc, const char *src_name,
 			H5G_entry_t *dst_loc, const char *dst_name);
-__DLL__ herr_t H5G_unlink(H5G_entry_t *loc, const char *name);
-__DLL__ herr_t H5G_find(H5G_entry_t *loc, const char *name,
+H5_DLL herr_t H5G_unlink(H5G_entry_t *loc, const char *name);
+H5_DLL herr_t H5G_find(H5G_entry_t *loc, const char *name,
 			H5G_entry_t *grp_ent/*out*/, H5G_entry_t *ent/*out*/);
-__DLL__ H5F_t *H5G_insertion_file(H5G_entry_t *loc, const char *name);
-__DLL__ herr_t H5G_traverse_slink(H5G_entry_t *grp_ent/*in,out*/,
+H5_DLL H5F_t *H5G_insertion_file(H5G_entry_t *loc, const char *name);
+H5_DLL herr_t H5G_traverse_slink(H5G_entry_t *grp_ent/*in,out*/,
 				  H5G_entry_t *obj_ent/*in,out*/,
 				  int *nlinks/*in,out*/);
-__DLL__ herr_t H5G_ent_encode(H5F_t *f, uint8_t **pp, const H5G_entry_t *ent);
-__DLL__ herr_t H5G_ent_decode(H5F_t *f, const uint8_t **pp,
+H5_DLL herr_t H5G_ent_encode(H5F_t *f, uint8_t **pp, const H5G_entry_t *ent);
+H5_DLL herr_t H5G_ent_decode(H5F_t *f, const uint8_t **pp,
 			      H5G_entry_t *ent/*out*/);
 
 /*
  * These functions operate on symbol table nodes.
  */
-__DLL__ herr_t H5G_node_debug(H5F_t *f, haddr_t addr, FILE *stream,
+H5_DLL herr_t H5G_node_debug(H5F_t *f, haddr_t addr, FILE *stream,
 			      int indent, int fwidth, haddr_t heap);
 
 /*
@@ -188,15 +188,15 @@ __DLL__ herr_t H5G_node_debug(H5F_t *f, haddr_t addr, FILE *stream,
  * in the H5O package where header messages are cached in symbol table
  * entries.  The subclasses of H5O probably don't need them though.
  */
-__DLL__ H5G_cache_t *H5G_ent_cache(H5G_entry_t *ent, H5G_type_t *cache_type);
-__DLL__ herr_t H5G_ent_modified(H5G_entry_t *ent, H5G_type_t cache_type);
-__DLL__ herr_t H5G_ent_debug(H5F_t *f, const H5G_entry_t *ent, FILE * stream,
+H5_DLL H5G_cache_t *H5G_ent_cache(H5G_entry_t *ent, H5G_type_t *cache_type);
+H5_DLL herr_t H5G_ent_modified(H5G_entry_t *ent, H5G_type_t cache_type);
+H5_DLL herr_t H5G_ent_debug(H5F_t *f, const H5G_entry_t *ent, FILE * stream,
 			     int indent, int fwidth, haddr_t heap);
-__DLL__  herr_t H5G_replace_name( int type, H5G_entry_t	*loc, const char *src_name, 
+H5_DLL  herr_t H5G_replace_name( int type, H5G_entry_t	*loc, const char *src_name, 
 																								 const char *dst_name, int op );
-__DLL__  herr_t H5G_insert_name( H5G_entry_t	*loc, H5G_entry_t	*obj, const char *name);
-__DLL__  herr_t H5G_ent_copy( const H5G_entry_t *src, H5G_entry_t *dst );
+H5_DLL  herr_t H5G_insert_name( H5G_entry_t	*loc, H5G_entry_t	*obj, const char *name);
+H5_DLL  herr_t H5G_ent_copy( const H5G_entry_t *src, H5G_entry_t *dst );
 /*Free the ID to name buffer */
-__DLL__  herr_t H5G_free_grp_name(H5G_t *grp);
-__DLL__  herr_t H5G_free_ent_name(H5G_entry_t *ent);
+H5_DLL  herr_t H5G_free_grp_name(H5G_t *grp);
+H5_DLL  herr_t H5G_free_ent_name(H5G_entry_t *ent);
 #endif