blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1124 from 5nefarious/handle-32bit-time 

fix: handle 32 bit time_t (or smaller)
This commit is contained in:
emersion 2018-07-09 17:22:22 +01:00 committed by GitHub
parent ffc8780893 fad62a3e1c
commit e78d72f42e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
types/wlr_export_dmabuf_v1.c
View File

@ -46,8 +46,9 @@ static void frame_output_handle_swap_buffers(struct wl_listener *listener,
wl_list_remove(&frame->output_swap_buffers.link); wl_list_remove(&frame->output_swap_buffers.link);
wl_list_init(&frame->output_swap_buffers.link); wl_list_init(&frame->output_swap_buffers.link);
uint32_t tv_sec_hi = event->when->tv_sec >> 32; time_t tv_sec = event->when->tv_sec;
uint32_t tv_sec_lo = event->when->tv_sec & 0xFFFFFFFF; uint32_t tv_sec_hi = (sizeof(tv_sec) > 4) ? tv_sec >> 32 : 0;
uint32_t tv_sec_lo = tv_sec & 0xFFFFFFFF;
zwlr_export_dmabuf_frame_v1_send_ready(frame->resource, zwlr_export_dmabuf_frame_v1_send_ready(frame->resource,
tv_sec_hi, tv_sec_lo, event->when->tv_nsec); tv_sec_hi, tv_sec_lo, event->when->tv_nsec);
} }

5
types/wlr_screencopy_v1.c
View File

@ -66,8 +66,9 @@ static void frame_handle_output_swap_buffers(struct wl_listener *listener,
zwlr_screencopy_frame_v1_send_flags(frame->resource, flags); zwlr_screencopy_frame_v1_send_flags(frame->resource, flags);
uint32_t tv_sec_hi = event->when->tv_sec >> 32; time_t tv_sec = event->when->tv_sec;
uint32_t tv_sec_lo = event->when->tv_sec & 0xFFFFFFFF; uint32_t tv_sec_hi = (sizeof(tv_sec) > 4) ? tv_sec >> 32 : 0;
uint32_t tv_sec_lo = tv_sec & 0xFFFFFFFF;
zwlr_screencopy_frame_v1_send_ready(frame->resource, zwlr_screencopy_frame_v1_send_ready(frame->resource,
tv_sec_hi, tv_sec_lo, event->when->tv_nsec); tv_sec_hi, tv_sec_lo, event->when->tv_nsec);