From 735ba3a7b7b5b874ab746ea22fda3b0525878899 Mon Sep 17 00:00:00 2001 From: Yuri Pankov <113725409+yuripv@users.noreply.github.com> Date: Fri, 1 Dec 2023 01:36:33 +0700 Subject: [PATCH] Use uint64_t instead of u_int64_t Reviewed-by: Alexander Motin Reviewed-by: Brian Behlendorf Signed-off-by: Yuri Pankov Closes #15610 --- include/os/freebsd/spl/sys/time.h | 4 +--- lib/libspl/include/sys/time.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/os/freebsd/spl/sys/time.h b/include/os/freebsd/spl/sys/time.h index fbc679aacf..47d64c3475 100644 --- a/include/os/freebsd/spl/sys/time.h +++ b/include/os/freebsd/spl/sys/time.h @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef _OPENSOLARIS_SYS_TIME_H_ @@ -91,6 +89,6 @@ gethrtime(void) { struct timespec ts; clock_gettime(CLOCK_UPTIME, &ts); - return (((u_int64_t)ts.tv_sec) * NANOSEC + ts.tv_nsec); + return (((uint64_t)ts.tv_sec) * NANOSEC + ts.tv_nsec); } #endif /* !_OPENSOLARIS_SYS_TIME_H_ */ diff --git a/lib/libspl/include/sys/time.h b/lib/libspl/include/sys/time.h index e692415a04..0f7d5196b3 100644 --- a/lib/libspl/include/sys/time.h +++ b/lib/libspl/include/sys/time.h @@ -101,7 +101,7 @@ gethrtime(void) { struct timespec ts; (void) clock_gettime(CLOCK_MONOTONIC, &ts); - return ((((u_int64_t)ts.tv_sec) * NANOSEC) + ts.tv_nsec); + return ((((uint64_t)ts.tv_sec) * NANOSEC) + ts.tv_nsec); } #endif /* _LIBSPL_SYS_TIME_H */