Module Name: xsrc
Committed By: christos
Date: Tue Mar 7 16:23:20 UTC 2017
Modified Files:
xsrc/external/mit/libdrm/dist: libsync.h
Log Message:
fix incomplete initializers for clang.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/libdrm/dist/libsync.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/libsync.h
diff -u xsrc/external/mit/libdrm/dist/libsync.h:1.1.1.1 xsrc/external/mit/libdrm/dist/libsync.h:1.2
--- xsrc/external/mit/libdrm/dist/libsync.h:1.1.1.1 Sat Mar 4 18:15:50 2017
+++ xsrc/external/mit/libdrm/dist/libsync.h Tue Mar 7 11:23:20 2017
@@ -60,11 +60,13 @@ struct sync_merge_data {
static inline int sync_wait(int fd, int timeout)
{
- struct pollfd fds = {0};
+ struct pollfd fds;
int ret;
+ memset(&fds, 0, sizeof(fds));
fds.fd = fd;
fds.events = POLLIN;
+ fds.revents = 0;
do {
ret = poll(&fds, 1, timeout);
@@ -85,11 +87,14 @@ static inline int sync_wait(int fd, int
static inline int sync_merge(const char *name, int fd1, int fd2)
{
- struct sync_merge_data data = {0};
+ struct sync_merge_data data;
int ret;
data.fd2 = fd2;
strncpy(data.name, name, sizeof(data.name));
+ data.fence = 0;
+ data.flags = 0;
+ data.pad = 0;
do {
ret = ioctl(fd1, SYNC_IOC_MERGE, &data);
