diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-24 19:15:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-24 19:16:28 (GMT) |
| commit | c98ec731f90eb0180c89108b7d2e42263b66d1ed (patch) | |
| tree | 2d67994bbea44ba6712e6dcb637438f6dbfb0ac6 /Utilities/cmlibuv/src/win/internal.h | |
| parent | 0436f70f80de4a56313b9da0668ac6674078b2d1 (diff) | |
| parent | 7a0506bafe387bfff441c0159b9a3d58f68db177 (diff) | |
| download | CMake-c98ec731f90eb0180c89108b7d2e42263b66d1ed.zip CMake-c98ec731f90eb0180c89108b7d2e42263b66d1ed.tar.gz CMake-c98ec731f90eb0180c89108b7d2e42263b66d1ed.tar.bz2 | |
Merge topic 'update-libuv'
7a0506bafe libuv: Suppress conversion warning on Windows
2269ad6a0a libuv: Add fs_copy stub to cmake-bootstrap.c
e21325c2c6 Merge branch 'upstream-libuv' into update-libuv
c1463f959f libuv 2020-09-22 (ed5b42d5)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5259
Diffstat (limited to 'Utilities/cmlibuv/src/win/internal.h')
| -rw-r--r-- | Utilities/cmlibuv/src/win/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmlibuv/src/win/internal.h b/Utilities/cmlibuv/src/win/internal.h index 463ef33..3f56777 100644 --- a/Utilities/cmlibuv/src/win/internal.h +++ b/Utilities/cmlibuv/src/win/internal.h @@ -270,7 +270,7 @@ void uv__fs_poll_endgame(uv_loop_t* loop, uv_fs_poll_t* handle); */ void uv__util_init(void); -uint64_t uv__hrtime(double scale); +uint64_t uv__hrtime(unsigned int scale); __declspec(noreturn) void uv_fatal_error(const int errorno, const char* syscall); int uv__getpwuid_r(uv_passwd_t* pwd); int uv__convert_utf16_to_utf8(const WCHAR* utf16, int utf16len, char** utf8); |