diff options
| author | Rémi Verschelde | 2018-05-12 09:39:51 +0200 |
|---|---|---|
| committer | GitHub | 2018-05-12 09:39:51 +0200 |
| commit | 9af5cab32ed4fab8bed28da2349cb08b45730342 (patch) | |
| tree | 88e40a7600cb0ed09d6f355b602dcd02f72cdbdd /drivers/unix/os_unix.cpp | |
| parent | 3d9deda8b367ae9c715bef7e9b1b5917ed81240f (diff) | |
| parent | ce64c2a32e0f1db8f0f75e1091a24d01fd669044 (diff) | |
| download | godot-9af5cab32ed4fab8bed28da2349cb08b45730342.tar.gz godot-9af5cab32ed4fab8bed28da2349cb08b45730342.tar.zst godot-9af5cab32ed4fab8bed28da2349cb08b45730342.zip | |
Merge pull request #18802 from bruvzg/fix_x11_arm_build
Fix X11 build on ARM Linux
Diffstat (limited to 'drivers/unix/os_unix.cpp')
| -rw-r--r-- | drivers/unix/os_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 1e34d63b1..05dfd69f5 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -244,7 +244,7 @@ OS::TimeZoneInfo OS_Unix::get_time_zone_info() const { void OS_Unix::delay_usec(uint32_t p_usec) const { - struct timespec rem = { p_usec / 1000000, (p_usec % 1000000) * 1000 }; + struct timespec rem = { static_cast<time_t>(p_usec / 1000000), static_cast<long>((p_usec % 1000000) * 1000) }; while (nanosleep(&rem, &rem) == EINTR) { } } |