mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
3dd092d0ce
commit
3051dabd08
3 changed files with 10 additions and 5 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue