From 8365a04e598aff7711c2f496737f26c98daea526 Mon Sep 17 00:00:00 2001 From: Clemens Gruber Date: Thu, 10 Dec 2015 16:30:45 +0100 Subject: [PATCH 1/2] Remove redundant autoconf check for clock_gettime which breaks configure on OS X Signed-off-by: Clemens Gruber --- configure.ac | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configure.ac b/configure.ac index 9fc9faf..ffe5185 100644 --- a/configure.ac +++ b/configure.ac @@ -461,14 +461,6 @@ AC_DEFINE_UNQUOTED([DBUS_CLIENT_GROUP], ["${DBUS_CLIENT_GROUP}"], [DBus client g AC_MSG_RESULT(${DBUS_CLIENT_GROUP}) AC_SUBST([DBUS_CLIENT_GROUP]) -dnl Check for clock_gettime. Some systems put it into -lc, while -dnl others use -lrt. Try the first and fallback to the latter. -RT_LIB= -AC_CHECK_FUNC([clock_gettime], [:], - [AC_CHECK_LIB([rt], [clock_gettime], [RT_LIB="-lrt"], - [AC_MSG_ERROR([Your system lacks clock_gettime])])]) -AC_SUBST(RT_LIB) - PKG_CHECK_MODULES([LIBEVENT], [libevent >= 2.0]) have_dbus=false From de4282ea97f2012da905d44f7369d6da29f58586 Mon Sep 17 00:00:00 2001 From: Clemens Gruber Date: Thu, 10 Dec 2015 16:31:53 +0100 Subject: [PATCH 2/2] Replace preadv and pwritev with pread and pwrite Fixes build errors on OS X and has better readability. Signed-off-by: Clemens Gruber --- src/util.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/util.c b/src/util.c index 6bb279c..5d6faef 100644 --- a/src/util.c +++ b/src/util.c @@ -286,12 +286,7 @@ int rtc_close(struct rtc_handle *handle) int file_write(int fd, void *buf, size_t sz) { - struct iovec iov[1]; - ssize_t ret; - iov[0].iov_base = buf; - iov[0].iov_len = sz; - ret = IGNORE_EINTR (pwritev (fd, iov, 1, 0)); - if (ret != sz) + if (IGNORE_EINTR(pwrite(fd, buf, sz, 0)) != sz) { return -1; } @@ -329,10 +324,7 @@ int file_close(int fd) int file_read(int fd, void *buf, size_t sz) { - struct iovec iov[1]; - iov[0].iov_base = buf; - iov[0].iov_len = sz; - if (preadv (fd, iov, 1, 0) != sz) + if (pread(fd, buf, sz, 0) != sz) { /* Returns -1 on read failure */ return -1;