[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/H5Oprivate.h b/src/H5Oprivate.h
index f7b8d9a..365a65f 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -119,13 +119,13 @@ typedef struct H5O_t {
  * Null Message.
  */
 #define H5O_NULL_ID	0x0000
-__DLLVAR__ const H5O_class_t H5O_NULL[1];
+H5_DLLVAR const H5O_class_t H5O_NULL[1];
 
 /*
  * Simple Data Space Message.
  */
 #define H5O_SDSPACE_ID	0x0001
-__DLLVAR__ const H5O_class_t H5O_SDSPACE[1];
+H5_DLLVAR const H5O_class_t H5O_SDSPACE[1];
 
 /* operates on an H5S_t struct */
 
@@ -133,7 +133,7 @@ __DLLVAR__ const H5O_class_t H5O_SDSPACE[1];
  * Data Type Message.
  */
 #define H5O_DTYPE_ID	0x0003
-__DLLVAR__ const H5O_class_t H5O_DTYPE[1];
+H5_DLLVAR const H5O_class_t H5O_DTYPE[1];
 
 /* operates on an H5T_t struct */
 
@@ -141,7 +141,7 @@ __DLLVAR__ const H5O_class_t H5O_DTYPE[1];
  * Old Fill Value Message.
  */
 #define H5O_FILL_ID         0x0004
-__DLLVAR__ const H5O_class_t    H5O_FILL[1];
+H5_DLLVAR const H5O_class_t    H5O_FILL[1];
 
 typedef struct H5O_fill_t {
     H5T_t               *type;          /*type. Null implies same as dataset */
@@ -155,7 +155,7 @@ typedef struct H5O_fill_t {
  * value is defined.
  */
 #define H5O_FILL_NEW_ID           0x0005
-__DLLVAR__ const H5O_class_t	H5O_FILL_NEW[1];
+H5_DLLVAR const H5O_class_t	H5O_FILL_NEW[1];
 
 typedef struct H5O_fill_new_t {
     H5T_t		*type;		/*type. Null implies same as dataset */
@@ -172,7 +172,7 @@ typedef struct H5O_fill_new_t {
 #define H5O_EFL_ID		0x0007	/*external file list id		     */
 #define H5O_EFL_ALLOC		16	/*number of slots to alloc at once   */
 #define H5O_EFL_UNLIMITED	H5F_UNLIMITED /*max possible file size	     */
-__DLLVAR__ const H5O_class_t H5O_EFL[1];/*external file list class	     */
+H5_DLLVAR const H5O_class_t H5O_EFL[1];/*external file list class	     */
 
 typedef struct H5O_efl_entry_t {
     size_t	name_offset;	/*offset of name within heap	     */
@@ -193,7 +193,7 @@ typedef struct H5O_efl_t {
  */
 #define H5O_LAYOUT_ID		0x0008
 #define H5O_LAYOUT_NDIMS	(H5S_MAX_RANK+1)
-__DLLVAR__ const H5O_class_t H5O_LAYOUT[1];
+H5_DLLVAR const H5O_class_t H5O_LAYOUT[1];
 
 typedef struct H5O_layout_t {
     int		type;			/*type of layout, H5D_layout_t	     */
@@ -209,7 +209,7 @@ typedef struct H5O_layout_t {
  * Filter pipeline message.
  */
 #define H5O_PLINE_ID	0x000b
-__DLLVAR__ const H5O_class_t H5O_PLINE[1];
+H5_DLLVAR const H5O_class_t H5O_PLINE[1];
 
 typedef struct H5O_pline_t {
     size_t	nfilters;		/*num filters defined		     */
@@ -227,7 +227,7 @@ typedef struct H5O_pline_t {
  * Attribute Message.
  */
 #define H5O_ATTR_ID	0x000c
-__DLLVAR__ const H5O_class_t H5O_ATTR[1];
+H5_DLLVAR const H5O_class_t H5O_ATTR[1];
 
 /* operates on an H5A_t struct */
 
@@ -235,7 +235,7 @@ __DLLVAR__ const H5O_class_t H5O_ATTR[1];
  * Object name message.
  */
 #define H5O_NAME_ID	0x000d
-__DLLVAR__ const H5O_class_t H5O_NAME[1];
+H5_DLLVAR const H5O_class_t H5O_NAME[1];
 
 typedef struct H5O_name_t {
     char	*s;			/*ptr to malloc'd memory	     */
@@ -245,7 +245,7 @@ typedef struct H5O_name_t {
  * Modification time message.  The message is just a `time_t'.
  */
 #define H5O_MTIME_ID	0x000e
-__DLLVAR__ const H5O_class_t H5O_MTIME[1];
+H5_DLLVAR const H5O_class_t H5O_MTIME[1];
 
 /*
  * Shared object message.  This message ID never really appears in an object
@@ -253,7 +253,7 @@ __DLLVAR__ const H5O_class_t H5O_MTIME[1];
  * will be the ID of the pointed-to message.
  */
 #define H5O_SHARED_ID	0x000f
-__DLLVAR__ const H5O_class_t H5O_SHARED[1];
+H5_DLLVAR const H5O_class_t H5O_SHARED[1];
 
 typedef struct H5O_shared_t {
     hbool_t		in_gh;		/*shared by global heap?	     */
@@ -267,7 +267,7 @@ typedef struct H5O_shared_t {
  * Object header continuation message.
  */
 #define H5O_CONT_ID	0x0010
-__DLLVAR__ const H5O_class_t H5O_CONT[1];
+H5_DLLVAR const H5O_class_t H5O_CONT[1];
 
 typedef struct H5O_cont_t {
     haddr_t	addr;			/*address of continuation block	     */
@@ -281,9 +281,9 @@ typedef struct H5O_cont_t {
  * Symbol table message.
  */
 #define H5O_STAB_ID	0x0011
-__DLLVAR__ const H5O_class_t H5O_STAB[1];
+H5_DLLVAR const H5O_class_t H5O_STAB[1];
 
-__DLL__ void *H5O_stab_fast(const H5G_cache_t *cache, const H5O_class_t *type,
+H5_DLL void *H5O_stab_fast(const H5G_cache_t *cache, const H5O_class_t *type,
 			    void *_mesg);
 
 typedef struct H5O_stab_t {
@@ -292,40 +292,40 @@ typedef struct H5O_stab_t {
 } H5O_stab_t;
 
 /* General message operators */
-__DLL__ herr_t H5O_create(H5F_t *f, size_t size_hint,
+H5_DLL herr_t H5O_create(H5F_t *f, size_t size_hint,
 			  H5G_entry_t *ent/*out*/);
-__DLL__ herr_t H5O_open(H5G_entry_t *ent);
-__DLL__ herr_t H5O_close(H5G_entry_t *ent);
-__DLL__ int H5O_link(H5G_entry_t *ent, int adjust);
-__DLL__ int H5O_count(H5G_entry_t *ent, const H5O_class_t *type);
-__DLL__ htri_t H5O_exists(H5G_entry_t *ent, const H5O_class_t *type,
+H5_DLL herr_t H5O_open(H5G_entry_t *ent);
+H5_DLL herr_t H5O_close(H5G_entry_t *ent);
+H5_DLL int H5O_link(H5G_entry_t *ent, int adjust);
+H5_DLL int H5O_count(H5G_entry_t *ent, const H5O_class_t *type);
+H5_DLL htri_t H5O_exists(H5G_entry_t *ent, const H5O_class_t *type,
 			  int sequence);
-__DLL__ void *H5O_read(H5G_entry_t *ent, const H5O_class_t *type,
+H5_DLL void *H5O_read(H5G_entry_t *ent, const H5O_class_t *type,
 		       int sequence, void *mesg);
-__DLL__ int H5O_modify(H5G_entry_t *ent, const H5O_class_t *type,
+H5_DLL int H5O_modify(H5G_entry_t *ent, const H5O_class_t *type,
 			int overwrite, unsigned flags, const void *mesg);
-__DLL__ herr_t H5O_touch(H5G_entry_t *ent, hbool_t force);
-__DLL__ herr_t H5O_remove(H5G_entry_t *ent, const H5O_class_t *type,
+H5_DLL herr_t H5O_touch(H5G_entry_t *ent, hbool_t force);
+H5_DLL herr_t H5O_remove(H5G_entry_t *ent, const H5O_class_t *type,
 			  int sequence);
-__DLL__ herr_t H5O_reset(const H5O_class_t *type, void *native);
-__DLL__ void *H5O_free(const H5O_class_t *type, void *mesg);
-__DLL__ void *H5O_copy(const H5O_class_t *type, const void *mesg, void *dst);
-__DLL__ herr_t H5O_share(H5F_t *f, const H5O_class_t *type, const void *mesg,
+H5_DLL herr_t H5O_reset(const H5O_class_t *type, void *native);
+H5_DLL void *H5O_free(const H5O_class_t *type, void *mesg);
+H5_DLL void *H5O_copy(const H5O_class_t *type, const void *mesg, void *dst);
+H5_DLL herr_t H5O_share(H5F_t *f, const H5O_class_t *type, const void *mesg,
 			 H5HG_t *hobj/*out*/);
-__DLL__ herr_t H5O_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent,
+H5_DLL herr_t H5O_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent,
 			 int fwidth);
 
 /* Layout operators */
-__DLL__ size_t H5O_layout_meta_size(H5F_t *f, const void *_mesg);
+H5_DLL size_t H5O_layout_meta_size(H5F_t *f, const void *_mesg);
 
 /* EFL operators */
-__DLL__ hsize_t H5O_efl_total_size(H5O_efl_t *efl);
-__DLL__ herr_t H5O_efl_read(H5F_t *f, const H5O_efl_t *efl, haddr_t addr,
+H5_DLL hsize_t H5O_efl_total_size(H5O_efl_t *efl);
+H5_DLL herr_t H5O_efl_read(H5F_t *f, const H5O_efl_t *efl, haddr_t addr,
 			    size_t size, uint8_t *buf);
-__DLL__ herr_t H5O_efl_write(H5F_t *f, const H5O_efl_t *efl, haddr_t addr,
+H5_DLL herr_t H5O_efl_write(H5F_t *f, const H5O_efl_t *efl, haddr_t addr,
 			     size_t size, const uint8_t *buf);
 
 /* Fill value operators */
-__DLL__ herr_t H5O_fill_convert(void *_fill, H5T_t *type);
+H5_DLL herr_t H5O_fill_convert(void *_fill, H5T_t *type);
 
 #endif