* ext/socket/socket.c (Init_socket): remove obsolete constants:

  IPsocket, TCPsocket, SOCKSsocket, TCPserver, UDPsocket,
  UNIXsocket, UNIXserver.

* eval.c (formal_assign): post splat arguments should have had
  higher priority than optional arguments, since they are
  mandatory.  [ruby-dev:28715]

* eval.c (VIS_MASK): broken. should be 15.  [ruby-dev:28715]

* io.c (argf_getc): should return one-character string.
  [ruby-dev:28715]

* io.c (rb_io_readchar): ditto.


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

1 files changed, 2 insertions, 0 deletions

diff --git a/sprintf.c b/sprintf.c
index 22c8c12d1c..90b1168d63 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -13,6 +13,7 @@
 **********************************************************************/
 
 #include "ruby.h"
+#include "re.h"
 #include <ctype.h>
 #include <math.h>
 #include <stdarg.h>
@@ -428,6 +429,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 			len = prec;
 		    }
 		}
+		/* need to adjust multi-byte string pos */
 		if (flags&FWIDTH) {
 		    if (width > len) {
 			CHECK(width);