From 554f2b439fc96fd575fbfec2e7118a19b3cdb689 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 3 Jul 2006 05:42:35 +0000 Subject: * 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/branches/ruby_1_8@10458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++-- ext/etc/extconf.rb | 7 +++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b035cff689..b17d27cee0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jul 3 14:42:06 2006 Nobuyoshi Nakada + + * 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 01:14:15 2006 Yukihiro Matsumoto * string.c (rb_str_inspect): encode \b (\010) for escape. @@ -41,7 +47,7 @@ Thu Jun 29 18:00:51 2006 Yukihiro Matsumoto Wed Jun 28 15:47:14 2006 Eric Hodel - * lib/optparse.rb: RDoc patch from Robin Stocker + * lib/optparse.rb: RDoc patch from Robin Stocker [ruby-core:08087] Wed Jun 28 19:04:34 2006 Tanaka Akira @@ -58,7 +64,7 @@ Tue Jun 27 22:47:18 2006 Hidetoshi NAGAI * ext/tk/tcltklib.c: forgot to update TCLTKLIB_RELEASE_DATE. - * ext/tk/lib/tk.rb (tk_tcl2ruby): [bug fix] somtimes fail to convert + * ext/tk/lib/tk.rb (tk_tcl2ruby): [bug fix] somtimes fail to convert a tcl string to a ruby object if the tcl string includes "\n". Tue Jun 27 16:04:05 2006 WATANABE Hirofumi diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb index 5cdb824fda..2496d36aa1 100644 --- a/ext/etc/extconf.rb +++ b/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 -- cgit v1.2.3