merge revision(s) 33819,33839:

        * io.c (ioctl_narg_len): don't use _IOC_SIZE macro on Linux.
          On Linux some constants for ioctl(2) doesn't include the size of
          its return value and 16bit value; for example FIONREAD 0x541B.
          Moreover the manual, ioctl_list(2),  says "Note  that  the  size
          bits  are  very unreliable: in lots of cases they are wrong,
          either because of buggy macros using sizeof(sizeof(struct)),
          or because of legacy values."
          So we shouldn't use it.

        * io.c (ioctl_narg_len, linux_iocparm_len): reinstantiate linux
          specific narg length calculation.

        * test/ruby/test_io.rb (test_ioctl_linux2): add new test for old and
          unstructured ioctl.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 3 deletions

diff --git a/version.h b/version.h
index eb1943f1e6..71d51ad57d 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 277
+#define RUBY_PATCHLEVEL 278
 
-#define RUBY_RELEASE_DATE "2012-10-11"
+#define RUBY_RELEASE_DATE "2012-10-12"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 12
 
 #include "ruby/version.h"