diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-01-17 18:15:16 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-05-20 14:31:50 (GMT) |
| commit | e54dcb1609842326a752bcff0863cbb5847e45f2 (patch) | |
| tree | eb9e92fc3333d259f37dcd433088f72f8453ffd8 | |
| parent | f59dfcb71122a4504f7540b646fe5a733c34ec3b (diff) | |
| download | hdf5-e54dcb1609842326a752bcff0863cbb5847e45f2.zip hdf5-e54dcb1609842326a752bcff0863cbb5847e45f2.tar.gz hdf5-e54dcb1609842326a752bcff0863cbb5847e45f2.tar.bz2 | |
Correct standalone function attributes
| -rw-r--r-- | tools/lib/io_timer.h | 13 | ||||
| -rw-r--r-- | tools/test/perform/pio_standalone.h | 4 | ||||
| -rw-r--r-- | tools/test/perform/sio_standalone.h | 4 |
3 files changed, 13 insertions, 8 deletions
diff --git a/tools/lib/io_timer.h b/tools/lib/io_timer.h index 1b90daf..c1fa58e 100644 --- a/tools/lib/io_timer.h +++ b/tools/lib/io_timer.h @@ -29,10 +29,6 @@ # include <winsock2.h> #endif /* H5_HAVE_WINSOCK2_H */ -#ifdef STANDALONE - #define H5TOOLS_DLL -#endif - /* The different types of timers we can have */ typedef enum timer_type_ { HDF5_FILE_OPENCLOSE, @@ -75,10 +71,19 @@ typedef struct io_time_t { #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ + +#ifdef STANDALONE +io_time_t *io_time_new(clock_type t); +void io_time_destroy(io_time_t *pt); +io_time_t *io_time_set(io_time_t *pt, timer_type t, int start_stop); +double io_time_get(io_time_t *pt, timer_type t); +#else H5TOOLS_DLL io_time_t *io_time_new(clock_type t); H5TOOLS_DLL void io_time_destroy(io_time_t *pt); H5TOOLS_DLL io_time_t *io_time_set(io_time_t *pt, timer_type t, int start_stop); H5TOOLS_DLL double io_time_get(io_time_t *pt, timer_type t); +#endif + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/tools/test/perform/pio_standalone.h b/tools/test/perform/pio_standalone.h index e6db2e8..cf6d980 100644 --- a/tools/test/perform/pio_standalone.h +++ b/tools/test/perform/pio_standalone.h @@ -483,8 +483,8 @@ extern MPI_Info h5_io_info_g; /* MPI INFO object for IO */ #endif #ifdef H5_HAVE_PARALLEL -H5TEST_DLL int h5_set_info_object(void); -H5TEST_DLL void h5_dump_info_object(MPI_Info info); +int h5_set_info_object(void); +void h5_dump_info_object(MPI_Info info); #endif diff --git a/tools/test/perform/sio_standalone.h b/tools/test/perform/sio_standalone.h index faa8317..45f6d25 100644 --- a/tools/test/perform/sio_standalone.h +++ b/tools/test/perform/sio_standalone.h @@ -498,8 +498,8 @@ extern MPI_Info h5_io_info_g; /* MPI INFO object for IO */ #endif #ifdef H5_HAVE_PARALLEL -H5TEST_DLL int h5_set_info_object(void); -H5TEST_DLL void h5_dump_info_object(MPI_Info info); +int h5_set_info_object(void); +void h5_dump_info_object(MPI_Info info); #endif |