aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gold/ChangeLog5
-rw-r--r--gold/fileread.cc6
2 files changed, 10 insertions, 1 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index d333449..5c63a9a 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-15 Viktor Kutuzov <vkutuzov@accesssoftek.com>
+
+ * fileread.cc: Only #include <sys/uio.h> if HAVE_READV.
+ (struct iovec): Correct !HAVE_READV definition.
+
2010-06-10 Cary Coutant <ccoutant@google.com>
* object.cc (Sized_relobj::do_layout): Defer layout for reloc sections.
diff --git a/gold/fileread.cc b/gold/fileread.cc
index dc5539f..10e1dec 100644
--- a/gold/fileread.cc
+++ b/gold/fileread.cc
@@ -27,7 +27,11 @@
#include <fcntl.h>
#include <unistd.h>
#include <sys/mman.h>
+
+#ifdef HAVE_READV
#include <sys/uio.h>
+#endif
+
#include <sys/stat.h>
#include "filenames.h"
@@ -42,7 +46,7 @@
#include "fileread.h"
#ifndef HAVE_READV
-struct iovec { void* iov_base; size_t iov_len };
+struct iovec { void* iov_base; size_t iov_len; };
ssize_t
readv(int, const iovec*, int)
{