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

diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h
index cf01aae..8bf09e1 100644
--- a/src/H5Dpublic.h
+++ b/src/H5Dpublic.h
@@ -70,29 +70,29 @@ typedef herr_t (*H5D_operator_t)(void *elem, hid_t type_id, hsize_t ndim,
 extern "C" {
 #endif
 
-__DLL__ hid_t H5Dcreate (hid_t file_id, const char *name, hid_t type_id,
+H5_DLL hid_t H5Dcreate (hid_t file_id, const char *name, hid_t type_id,
 			 hid_t space_id, hid_t plist_id);
-__DLL__ hid_t H5Dopen (hid_t file_id, const char *name);
-__DLL__ herr_t H5Dclose (hid_t dset_id);
-__DLL__ hid_t H5Dget_space (hid_t dset_id);
-__DLL__ herr_t H5Dget_space_status(hid_t dset_id, 
+H5_DLL hid_t H5Dopen (hid_t file_id, const char *name);
+H5_DLL herr_t H5Dclose (hid_t dset_id);
+H5_DLL hid_t H5Dget_space (hid_t dset_id);
+H5_DLL herr_t H5Dget_space_status(hid_t dset_id, 
 				H5D_space_status_t *allocation);
-__DLL__ hid_t H5Dget_type (hid_t dset_id);
-__DLL__ hid_t H5Dget_create_plist (hid_t dset_id);
-__DLL__ hsize_t H5Dget_storage_size(hid_t dset_id);
-__DLL__ herr_t H5Dread (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
+H5_DLL hid_t H5Dget_type (hid_t dset_id);
+H5_DLL hid_t H5Dget_create_plist (hid_t dset_id);
+H5_DLL hsize_t H5Dget_storage_size(hid_t dset_id);
+H5_DLL herr_t H5Dread (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
 			hid_t file_space_id, hid_t plist_id, void *buf/*out*/);
-__DLL__ herr_t H5Dwrite (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
+H5_DLL herr_t H5Dwrite (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
 			 hid_t file_space_id, hid_t plist_id, const void *buf);
-__DLL__ herr_t H5Dextend (hid_t dset_id, const hsize_t *size);
-__DLL__ herr_t H5Diterate(void *buf, hid_t type_id, hid_t space_id,
+H5_DLL herr_t H5Dextend (hid_t dset_id, const hsize_t *size);
+H5_DLL herr_t H5Diterate(void *buf, hid_t type_id, hid_t space_id,
             H5D_operator_t op, void *operator_data);
-__DLL__ herr_t H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf);
-__DLL__ herr_t H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id, hsize_t *size);
-__DLL__ herr_t H5Dfill(const void *fill, hid_t fill_type, void *buf,
+H5_DLL herr_t H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf);
+H5_DLL herr_t H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id, hsize_t *size);
+H5_DLL herr_t H5Dfill(const void *fill, hid_t fill_type, void *buf,
         hid_t buf_type, hid_t space);
-__DLL__ herr_t H5Ddebug(hid_t dset_id, unsigned int flags);
-__DLL__ herr_t H5Dset_extent (hid_t dset_id, const hsize_t *size);
+H5_DLL herr_t H5Ddebug(hid_t dset_id, unsigned int flags);
+H5_DLL herr_t H5Dset_extent (hid_t dset_id, const hsize_t *size);
 
 
 #ifdef __cplusplus