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/H5Epublic.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/H5Epublic.h')
| -rw-r--r-- | src/H5Epublic.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/H5Epublic.h b/src/H5Epublic.h index d6f1dc8..52e1e13 100644 --- a/src/H5Epublic.h +++ b/src/H5Epublic.h @@ -219,15 +219,15 @@ typedef herr_t (*H5E_auto_t)(void *client_data); extern "C" { #endif -__DLL__ herr_t H5Eset_auto (H5E_auto_t func, void *client_data); -__DLL__ herr_t H5Eget_auto (H5E_auto_t *func, void **client_data); -__DLL__ herr_t H5Eclear (void); -__DLL__ herr_t H5Eprint (FILE *stream); -__DLL__ herr_t H5Ewalk (H5E_direction_t direction, H5E_walk_t func, +H5_DLL herr_t H5Eset_auto (H5E_auto_t func, void *client_data); +H5_DLL herr_t H5Eget_auto (H5E_auto_t *func, void **client_data); +H5_DLL herr_t H5Eclear (void); +H5_DLL herr_t H5Eprint (FILE *stream); +H5_DLL herr_t H5Ewalk (H5E_direction_t direction, H5E_walk_t func, void *client_data); -__DLL__ const char *H5Eget_major (H5E_major_t major_number); -__DLL__ const char *H5Eget_minor (H5E_minor_t minor_number); -__DLL__ herr_t H5Epush(const char *file, const char *func, +H5_DLL const char *H5Eget_major (H5E_major_t major_number); +H5_DLL const char *H5Eget_minor (H5E_minor_t minor_number); +H5_DLL herr_t H5Epush(const char *file, const char *func, unsigned line, H5E_major_t maj, H5E_minor_t min, const char *str); #ifdef __cplusplus |