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/H5FDmpio.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/H5FDmpio.h')
-rw-r--r-- | src/H5FDmpio.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/H5FDmpio.h b/src/H5FDmpio.h index f1dd6f7..de55ccb 100644 --- a/src/H5FDmpio.h +++ b/src/H5FDmpio.h @@ -51,20 +51,20 @@ typedef struct H5FD_mpio_dxpl_t { #ifdef __cplusplus extern "C" { #endif -__DLL__ hid_t H5FD_mpio_init(void); -__DLL__ herr_t H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info); -__DLL__ herr_t H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/, +H5_DLL hid_t H5FD_mpio_init(void); +H5_DLL herr_t H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info); +H5_DLL herr_t H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/, MPI_Info *info/*out*/); -__DLL__ herr_t H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode); -__DLL__ herr_t H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode/*out*/); -__DLL__ MPI_Comm H5FD_mpio_communicator(H5FD_t *_file); -__DLL__ herr_t H5FD_mpio_setup(hid_t dxpl_id, MPI_Datatype btype, +H5_DLL herr_t H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode); +H5_DLL herr_t H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode/*out*/); +H5_DLL MPI_Comm H5FD_mpio_communicator(H5FD_t *_file); +H5_DLL herr_t H5FD_mpio_setup(hid_t dxpl_id, MPI_Datatype btype, MPI_Datatype ftype, unsigned use_view); -__DLL__ herr_t H5FD_mpio_teardown(hid_t dxpl_id); -__DLL__ herr_t H5FD_mpio_wait_for_left_neighbor(H5FD_t *file); -__DLL__ herr_t H5FD_mpio_signal_right_neighbor(H5FD_t *file); -__DLL__ int H5FD_mpio_mpi_rank(H5FD_t *_file); -__DLL__ int H5FD_mpio_mpi_size(H5FD_t *_file); +H5_DLL herr_t H5FD_mpio_teardown(hid_t dxpl_id); +H5_DLL herr_t H5FD_mpio_wait_for_left_neighbor(H5FD_t *file); +H5_DLL herr_t H5FD_mpio_signal_right_neighbor(H5FD_t *file); +H5_DLL int H5FD_mpio_mpi_rank(H5FD_t *_file); +H5_DLL int H5FD_mpio_mpi_size(H5FD_t *_file); #ifdef __cplusplus } #endif |