merges r21202 from trunk into ruby_1_9_1.

* ext/socket/mkconstants.rb: use sock_define_uconst for INADDR_*
  constants because Socket::INADDR_LOOPBACK should be 0x7f000001
  instead of -0xffffff.

* ext/socket/socket.c (sock_define_uconst): defined.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21226 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 9 insertions, 0 deletions

diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index a8b53bd53..c8d55cf37 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -3555,7 +3555,16 @@ sock_define_const(const char *name, int value, VALUE mConst)
     rb_define_const(rb_cSocket, name, INT2FIX(value));
     rb_define_const(mConst, name, INT2FIX(value));
 }
+
+static void
+sock_define_uconst(const char *name, unsigned int value, VALUE mConst)
+{
+    rb_define_const(rb_cSocket, name, UINT2NUM(value));
+    rb_define_const(mConst, name, UINT2NUM(value));
+}
+
 #define sock_define_const(name, value) sock_define_const(name, value, mConst)
+#define sock_define_uconst(name, value) sock_define_uconst(name, value, mConst)
 
 /*
  * Class +Socket+ provides access to the underlying operating system