diff options
author | MuQun Yang <ymuqun@hdfgroup.org> | 2002-09-20 20:36:09 (GMT) |
---|---|---|
committer | MuQun Yang <ymuqun@hdfgroup.org> | 2002-09-20 20:36:09 (GMT) |
commit | e5b28ef37b6cb97211e37f0900a97b14c97daf57 (patch) | |
tree | 123dce5773a6041fd75d9572a553a044219b01a3 /src/H5Eprivate.h | |
parent | 2aca3b77d63aa78d16262e23d929f2c13570a2d5 (diff) | |
download | hdf5-e5b28ef37b6cb97211e37f0900a97b14c97daf57.zip hdf5-e5b28ef37b6cb97211e37f0900a97b14c97daf57.tar.gz hdf5-e5b28ef37b6cb97211e37f0900a97b14c97daf57.tar.bz2 |
[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
Diffstat (limited to 'src/H5Eprivate.h')
-rw-r--r-- | src/H5Eprivate.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Eprivate.h b/src/H5Eprivate.h index 424456e..db7f096 100644 --- a/src/H5Eprivate.h +++ b/src/H5Eprivate.h @@ -116,15 +116,15 @@ typedef struct H5E_t { H5E_error_t slot[H5E_NSLOTS]; /*array of error records */ } H5E_t; -__DLLVAR__ const hbool_t H5E_clearable_g;/*safe to call H5E_clear() on enter?*/ -__DLLVAR__ herr_t (*H5E_auto_g)(void *client_data); -__DLLVAR__ void *H5E_auto_data_g; +H5_DLLVAR const hbool_t H5E_clearable_g;/*safe to call H5E_clear() on enter?*/ +H5_DLLVAR herr_t (*H5E_auto_g)(void *client_data); +H5_DLLVAR void *H5E_auto_data_g; -__DLL__ herr_t H5E_push (H5E_major_t maj_num, H5E_minor_t min_num, +H5_DLL herr_t H5E_push (H5E_major_t maj_num, H5E_minor_t min_num, const char *func_name, const char *file_name, unsigned line, const char *desc); -__DLL__ herr_t H5E_clear (void); -__DLL__ herr_t H5E_walk (H5E_direction_t dir, H5E_walk_t func, +H5_DLL herr_t H5E_clear (void); +H5_DLL herr_t H5E_walk (H5E_direction_t dir, H5E_walk_t func, void *client_data); #endif |