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

diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h
index fc0d64f..03ab355 100644
--- a/src/H5Pprivate.h
+++ b/src/H5Pprivate.h
@@ -26,45 +26,45 @@ typedef struct H5P_genplist_t H5P_genplist_t;
 typedef struct H5P_genclass_t H5P_genclass_t;
 
 /* Private functions, not part of the publicly documented API */
-__DLL__ herr_t H5P_init(void);
+H5_DLL herr_t H5P_init(void);
 
 /* Internal versions of API routines */
-__DLL__ hid_t H5P_create_id(H5P_genclass_t *pclass);
-__DLL__ hid_t H5P_copy_plist(H5P_genplist_t *old_plist);
-__DLL__ herr_t H5P_get(H5P_genplist_t *plist, const char *name, void *value);
-__DLL__ herr_t H5P_set(H5P_genplist_t *plist, const char *name, const void *value);
-__DLL__ herr_t H5P_insert(H5P_genplist_t *plist, const char *name, size_t size,
+H5_DLL hid_t H5P_create_id(H5P_genclass_t *pclass);
+H5_DLL hid_t H5P_copy_plist(H5P_genplist_t *old_plist);
+H5_DLL herr_t H5P_get(H5P_genplist_t *plist, const char *name, void *value);
+H5_DLL herr_t H5P_set(H5P_genplist_t *plist, const char *name, const void *value);
+H5_DLL herr_t H5P_insert(H5P_genplist_t *plist, const char *name, size_t size,
     void *value, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
     H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy, 
     H5P_prp_close_func_t prp_close);
-__DLL__ herr_t H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name);
-__DLL__ htri_t H5P_exist_plist(H5P_genplist_t *plist, const char *name);
-__DLL__ char *H5P_get_class_name(H5P_genclass_t *pclass);
-__DLL__ herr_t H5P_get_nprops_pclass(H5P_genclass_t *pclass, size_t *nprops);
-__DLL__ herr_t H5P_register(H5P_genclass_t *pclass, const char *name, size_t size,
+H5_DLL herr_t H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name);
+H5_DLL htri_t H5P_exist_plist(H5P_genplist_t *plist, const char *name);
+H5_DLL char *H5P_get_class_name(H5P_genclass_t *pclass);
+H5_DLL herr_t H5P_get_nprops_pclass(H5P_genclass_t *pclass, size_t *nprops);
+H5_DLL herr_t H5P_register(H5P_genclass_t *pclass, const char *name, size_t size,
             void *def_value, H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
             H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete,
             H5P_prp_copy_func_t prp_copy, H5P_prp_close_func_t prp_close);
-__DLL__ hid_t H5P_get_driver(H5P_genplist_t *plist);
-__DLL__ void * H5P_get_driver_info(H5P_genplist_t *plist);
-__DLL__ herr_t H5P_set_driver(H5P_genplist_t *plist, hid_t new_driver_id,
+H5_DLL hid_t H5P_get_driver(H5P_genplist_t *plist);
+H5_DLL void * H5P_get_driver_info(H5P_genplist_t *plist);
+H5_DLL herr_t H5P_set_driver(H5P_genplist_t *plist, hid_t new_driver_id,
             const void *new_driver_info);
-__DLL__ herr_t H5P_set_vlen_mem_manager(H5P_genplist_t *plist,
+H5_DLL herr_t H5P_set_vlen_mem_manager(H5P_genplist_t *plist,
         H5MM_allocate_t alloc_func, void *alloc_info, H5MM_free_t free_func,
         void *free_info);
-__DLL__ herr_t H5P_fill_value_defined(H5P_genplist_t *plist,
+H5_DLL herr_t H5P_fill_value_defined(H5P_genplist_t *plist,
         H5D_fill_value_t *status);
 
 /* *SPECIAL* Don't make more of these! -QAK */
-__DLL__ htri_t H5P_isa_class(hid_t plist_id, hid_t pclass_id);
-__DLL__ void *H5P_object_verify(hid_t plist_id, hid_t pclass_id);
+H5_DLL htri_t H5P_isa_class(hid_t plist_id, hid_t pclass_id);
+H5_DLL void *H5P_object_verify(hid_t plist_id, hid_t pclass_id);
 
 
 /* Private functions to "peek" at properties of a certain type */
-__DLL__ unsigned H5P_peek_unsigned(H5P_genplist_t *plist, const char *name);
-__DLL__ hid_t H5P_peek_hid_t(H5P_genplist_t *plist, const char *name);
-__DLL__ void *H5P_peek_voidp(H5P_genplist_t *plist, const char *name);
-__DLL__ hsize_t H5P_peek_hsize_t(H5P_genplist_t *plist, const char *name);
-__DLL__ size_t H5P_peek_size_t(H5P_genplist_t *plist, const char *name);
+H5_DLL unsigned H5P_peek_unsigned(H5P_genplist_t *plist, const char *name);
+H5_DLL hid_t H5P_peek_hid_t(H5P_genplist_t *plist, const char *name);
+H5_DLL void *H5P_peek_voidp(H5P_genplist_t *plist, const char *name);
+H5_DLL hsize_t H5P_peek_hsize_t(H5P_genplist_t *plist, const char *name);
+H5_DLL size_t H5P_peek_size_t(H5P_genplist_t *plist, const char *name);
 
 #endif