am 984d3570: update libsync to support new timeout semantics

* commit '984d35703d5c6738253193bd53da9dedb3b58243':
  update libsync to support new timeout semantics
This commit is contained in:
Erik Gilling 2012-08-21 19:11:04 -07:00 committed by Android Git Automerger
commit d5f149b3f5
2 changed files with 3 additions and 3 deletions

View File

@ -42,7 +42,7 @@ struct sync_pt_info {
};
/* timeout in msecs */
int sync_wait(int fd, unsigned int timeout);
int sync_wait(int fd, int timeout);
int sync_merge(const char *name, int fd1, int fd2);
struct sync_fence_info_data *sync_fence_info(int fd);
struct sync_pt_info *sync_pt_info(struct sync_fence_info_data *info,

View File

@ -27,9 +27,9 @@
#include <sys/stat.h>
#include <sys/types.h>
int sync_wait(int fd, unsigned int timeout)
int sync_wait(int fd, int timeout)
{
__u32 to = timeout;
__s32 to = timeout;
return ioctl(fd, SYNC_IOC_WAIT, &to);
}