diff options
author | Quincey Koziol <koziol@lbl.gov> | 2020-11-23 16:18:26 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-23 16:18:26 (GMT) |
commit | 5ff09ae971cdb8a85c596520666c8dc178541e4a (patch) | |
tree | 56cd3f440387a7bd29938a8fc150a2073bc50e19 /src/H5timer.c | |
parent | d4a3097ec5d9e44d377c4b91a05b3e0c5f9f1e2c (diff) | |
download | hdf5-5ff09ae971cdb8a85c596520666c8dc178541e4a.zip hdf5-5ff09ae971cdb8a85c596520666c8dc178541e4a.tar.gz hdf5-5ff09ae971cdb8a85c596520666c8dc178541e4a.tar.bz2 |
Basic alignment with async branch (#115)
* Basic alignment with async branch - trivial changes to reduce clutter in overall diff.
* Update minor error code to reflect change within library
* Update the error output to match library
Diffstat (limited to 'src/H5timer.c')
-rw-r--r-- | src/H5timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5timer.c b/src/H5timer.c index b53c302..b637a16 100644 --- a/src/H5timer.c +++ b/src/H5timer.c @@ -164,7 +164,7 @@ H5_now(void) HDgettimeofday(&now_tv, NULL); now = now_tv.tv_sec; } -#else /* H5_HAVE_GETTIMEOFDAY */ +#else /* H5_HAVE_GETTIMEOFDAY */ now = HDtime(NULL); #endif /* H5_HAVE_GETTIMEOFDAY */ @@ -202,8 +202,8 @@ H5_now_usec(void) HDgettimeofday(&now_tv, NULL); now = (uint64_t)(now_tv.tv_sec * (1000 * 1000)) + (uint64_t)now_tv.tv_usec; } -#else /* H5_HAVE_GETTIMEOFDAY */ - now = (uint64_t)(HDtime(NULL) * (1000 * 1000)); +#else /* H5_HAVE_GETTIMEOFDAY */ + now = (uint64_t)(HDtime(NULL) * (1000 * 1000)); #endif /* H5_HAVE_GETTIMEOFDAY */ return (now); |