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/H5Fpublic.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/H5Fpublic.h')
-rw-r--r-- | src/H5Fpublic.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index 72a0011..fc23620 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -82,21 +82,21 @@ extern "C" { #endif /* Functions in H5F.c */ -__DLL__ htri_t H5Fis_hdf5 (const char *filename); -__DLL__ hid_t H5Fcreate (const char *filename, unsigned flags, +H5_DLL htri_t H5Fis_hdf5 (const char *filename); +H5_DLL hid_t H5Fcreate (const char *filename, unsigned flags, hid_t create_plist, hid_t access_plist); -__DLL__ hid_t H5Fopen (const char *filename, unsigned flags, +H5_DLL hid_t H5Fopen (const char *filename, unsigned flags, hid_t access_plist); -__DLL__ hid_t H5Freopen(hid_t file_id); -__DLL__ herr_t H5Fflush(hid_t object_id, H5F_scope_t scope); -__DLL__ herr_t H5Fclose (hid_t file_id); -__DLL__ hid_t H5Fget_create_plist (hid_t file_id); -__DLL__ hid_t H5Fget_access_plist (hid_t file_id); -__DLL__ herr_t H5Fget_obj_count(hid_t file_id, unsigned types, +H5_DLL hid_t H5Freopen(hid_t file_id); +H5_DLL herr_t H5Fflush(hid_t object_id, H5F_scope_t scope); +H5_DLL herr_t H5Fclose (hid_t file_id); +H5_DLL hid_t H5Fget_create_plist (hid_t file_id); +H5_DLL hid_t H5Fget_access_plist (hid_t file_id); +H5_DLL herr_t H5Fget_obj_count(hid_t file_id, unsigned types, unsigned *obj_id_count); -__DLL__ herr_t H5Fget_obj_ids(hid_t file_id, unsigned types, hid_t *obj_id_list); -__DLL__ herr_t H5Fmount(hid_t loc, const char *name, hid_t child, hid_t plist); -__DLL__ herr_t H5Funmount(hid_t loc, const char *name); +H5_DLL herr_t H5Fget_obj_ids(hid_t file_id, unsigned types, hid_t *obj_id_list); +H5_DLL herr_t H5Fmount(hid_t loc, const char *name, hid_t child, hid_t plist); +H5_DLL herr_t H5Funmount(hid_t loc, const char *name); #ifdef __cplusplus } |