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

diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h
index 52a8dec..fa4c5ad 100644
--- a/src/H5FDpublic.h
+++ b/src/H5FDpublic.h
@@ -200,25 +200,25 @@ extern "C" {
 #endif
 
 /* Function prototypes */
-__DLL__ hid_t H5FDregister(const H5FD_class_t *cls);
-__DLL__ herr_t H5FDunregister(hid_t driver_id);
-__DLL__ H5FD_t *H5FDopen(const char *name, unsigned flags, hid_t fapl_id,
+H5_DLL hid_t H5FDregister(const H5FD_class_t *cls);
+H5_DLL herr_t H5FDunregister(hid_t driver_id);
+H5_DLL H5FD_t *H5FDopen(const char *name, unsigned flags, hid_t fapl_id,
 		 haddr_t maxaddr);
-__DLL__ herr_t H5FDclose(H5FD_t *file);
-__DLL__ int H5FDcmp(const H5FD_t *f1, const H5FD_t *f2);
-__DLL__ int H5FDquery(const H5FD_t *f, unsigned long *flags);
-__DLL__ haddr_t H5FDalloc(H5FD_t *file, H5FD_mem_t type, hsize_t size);
-__DLL__ herr_t H5FDfree(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size);
-__DLL__ haddr_t H5FDrealloc(H5FD_t *file, H5FD_mem_t type, haddr_t addr,
+H5_DLL herr_t H5FDclose(H5FD_t *file);
+H5_DLL int H5FDcmp(const H5FD_t *f1, const H5FD_t *f2);
+H5_DLL int H5FDquery(const H5FD_t *f, unsigned long *flags);
+H5_DLL haddr_t H5FDalloc(H5FD_t *file, H5FD_mem_t type, hsize_t size);
+H5_DLL herr_t H5FDfree(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size);
+H5_DLL haddr_t H5FDrealloc(H5FD_t *file, H5FD_mem_t type, haddr_t addr,
 		    hsize_t old_size, hsize_t new_size);
-__DLL__ haddr_t H5FDget_eoa(H5FD_t *file);
-__DLL__ herr_t H5FDset_eoa(H5FD_t *file, haddr_t eof);
-__DLL__ haddr_t H5FDget_eof(H5FD_t *file);
-__DLL__ herr_t H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
+H5_DLL haddr_t H5FDget_eoa(H5FD_t *file);
+H5_DLL herr_t H5FDset_eoa(H5FD_t *file, haddr_t eof);
+H5_DLL haddr_t H5FDget_eof(H5FD_t *file);
+H5_DLL herr_t H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
 		void *buf/*out*/);
-__DLL__ herr_t H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
+H5_DLL herr_t H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
 		 const void *buf);
-__DLL__ herr_t H5FDflush(H5FD_t *file, unsigned closing);
+H5_DLL herr_t H5FDflush(H5FD_t *file, unsigned closing);
 
 #ifdef __cplusplus
 }