From 26be0c8ad8f6fd17c70e4be7c0eea3a9d381e866 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Tue, 3 Sep 2019 13:41:51 +0000 Subject: compiler-rt: use more __sanitizer_time_t on FreeBSD A few structs were using long for time_t members. NFC. Reviewed by: devnexen Differential Revision: https://reviews.llvm.org/D66756 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@370755 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../sanitizer_platform_limits_freebsd.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h b/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h index 46307c6c4..f02f8cd23 100644 --- a/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h +++ b/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h @@ -114,15 +114,21 @@ namespace __sanitizer { long key; }; +#if defined(__LP64___) + typedef long long __sanitizer_time_t; +#else + typedef long __sanitizer_time_t; +#endif + struct __sanitizer_shmid_ds { __sanitizer_ipc_perm shm_perm; unsigned long shm_segsz; unsigned int shm_lpid; unsigned int shm_cpid; int shm_nattch; - unsigned long shm_atime; - unsigned long shm_dtime; - unsigned long shm_ctime; + __sanitizer_time_t shm_atime; + __sanitizer_time_t shm_dtime; + __sanitizer_time_t shm_ctime; }; extern unsigned struct_msqid_ds_sz; @@ -153,12 +159,12 @@ namespace __sanitizer { char *pw_passwd; int pw_uid; int pw_gid; - long pw_change; + __sanitizer_time_t pw_change; char *pw_class; char *pw_gecos; char *pw_dir; char *pw_shell; - long pw_expire; + __sanitizer_time_t pw_expire; int pw_fields; }; @@ -169,12 +175,6 @@ namespace __sanitizer { char **gr_mem; }; -#if defined(__LP64___) - typedef long long __sanitizer_time_t; -#else - typedef long __sanitizer_time_t; -#endif - typedef long __sanitizer_suseconds_t; struct __sanitizer_timeval { -- cgit v1.2.1