summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--io.c4
-rw-r--r--process.c2
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0959d20..e52a75b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Sep 15 16:21:10 2014 Eric Wong <e@80x24.org>
+
+ * io.c (struct io_advise_struct): 32 => 24 bytes on 64-bit
+ * io.c (struct io_internal_writev_struct): 24 => 16 bytes on 64-bit
+ * process.c (struct waitpid_arg): ditto
+
Mon Sep 15 10:29:25 2014 Natalie Weizenbaum <nweiz@google.com>
* ext/pathname/lib/pathname.rb (SAME_PATHS):
diff --git a/io.c b/io.c
index 7301cbd..5909a0b 100644
--- a/io.c
+++ b/io.c
@@ -941,8 +941,8 @@ struct io_internal_write_struct {
#ifdef HAVE_WRITEV
struct io_internal_writev_struct {
int fd;
- const struct iovec *iov;
int iovcnt;
+ const struct iovec *iov;
};
#endif
@@ -8462,9 +8462,9 @@ static VALUE sym_normal, sym_sequential, sym_random,
#ifdef HAVE_POSIX_FADVISE
struct io_advise_struct {
int fd;
+ int advice;
off_t offset;
off_t len;
- int advice;
};
static VALUE
diff --git a/process.c b/process.c
index c4965ec..1ea637a 100644
--- a/process.c
+++ b/process.c
@@ -740,8 +740,8 @@ waitall_each(rb_pid_t pid, int status, VALUE ary)
#else
struct waitpid_arg {
rb_pid_t pid;
- int *st;
int flags;
+ int *st;
};
#endif