aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--include/ruby/io.h5
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 30e5affb5e..59f8e78d8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul 22 01:48:38 2014 Eric Wong <e@80x24.org>
+
+ * include/ruby/io.h (rb_io_buffer_t): fix packing on gcc
+ r46892 caused packing to be a no-op on gcc (4.7.2-5, Debian)
+ [Bug #10079][ruby-core:63912]
+
Mon Jul 21 15:55:42 2014 fuji70 <fujifuji70@gmail.com>
* lib/optparse.rb (getopts): print default values and descriptions
diff --git a/include/ruby/io.h b/include/ruby/io.h
index b1e94361c3..b230a61b40 100644
--- a/include/ruby/io.h
+++ b/include/ruby/io.h
@@ -51,12 +51,13 @@ extern "C" {
RUBY_SYMBOL_EXPORT_BEGIN
-PACKED_STRUCT(typedef struct {
+PACKED_STRUCT(struct rb_io_buffer_t {
char *ptr; /* off + len <= capa */
int off;
int len;
int capa;
-} rb_io_buffer_t);
+});
+typedef struct rb_io_buffer_t rb_io_buffer_t;
typedef struct rb_io_t {
FILE *stdio_file; /* stdio ptr for read/write if available */