* ext/etc/extconf.rb (PW_UID2VAL, PW_GID2VAL): defaulted to conversion

from int, and sys/types.h needs to be included before grp.h.
  fixed: [ruby-dev:28938]


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

ChangeLog

@@ -1,3 +1,9 @@
+Mon Jul  3 14:42:06 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/extconf.rb (PW_UID2VAL, PW_GID2VAL): defaulted to conversion
+	  from int, and sys/types.h needs to be included before grp.h.
+	  fixed: [ruby-dev:28938]
+
 Mon Jul  3 10:44:01 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (popen_exec): close file descriptors other than standard I/Os.

ext/etc/etc.c

@@ -483,7 +483,7 @@ static VALUE mEtc;
  * Documented by mathew <meta@pobox.com>.
  */
 void
-Init_etc()
+Init_etc(void)
 {
     mEtc = rb_define_module("Etc");
 

ext/etc/extconf.rb

@@ -25,18 +25,17 @@ if  a or b or c
   have_struct_member('struct passwd', 'pw_passwd', 'pwd.h')
   have_struct_member('struct group', 'gr_passwd', 'grp.h')
   [%w"uid_t pwd.h", %w"gid_t grp.h"].each do |t, *h|
-    h << "sys/types.h"
+    h.unshift("sys/types.h")
+    f = "INT2NUM"
     if have_type(t, h)
       if try_static_assert("sizeof(#{t}) > sizeof(long)", h)
 	f = "LL2NUM"
-      else
-	f = "INT2NUM"
       end
       if try_static_assert("(#{t})-1 > 0", h)
 	f = "U#{f}"
       end
-      $defs.push("-DPW_#{t.chomp('_t').upcase}2VAL=#{f}")
     end
+    $defs.push("-DPW_#{t.chomp('_t').upcase}2VAL=#{f}")
   end
   create_makefile("etc")
 end