diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-03 05:42:35 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-03 05:42:35 +0000 |
| commit | e718e90f13d0546b34533bf14eb8d71d1f31033a (patch) | |
| tree | c86063b6ee5a192f5a8e39ababdf310e3016b1ad /ext | |
| parent | fcddc3fde34b6d9f5774e548a3c4262bf7da2e06 (diff) | |
| download | ruby-e718e90f13d0546b34533bf14eb8d71d1f31033a.tar.gz ruby-e718e90f13d0546b34533bf14eb8d71d1f31033a.tar.xz ruby-e718e90f13d0546b34533bf14eb8d71d1f31033a.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@10458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/etc/etc.c | 2 | ||||
| -rw-r--r-- | ext/etc/extconf.rb | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ext/etc/etc.c b/ext/etc/etc.c index 05d40cac3..06ae842d4 100644 --- a/ext/etc/etc.c +++ b/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"); diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb index 5cdb824fd..2496d36aa 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 |