diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-06 23:35:31 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-06 23:35:31 +0000 |
| commit | e9e21c9c806dfd094dd7525ac03a621905ded8d9 (patch) | |
| tree | b4ae8f2da63dea1f28990f24211b1395b54662fd /ext/etc | |
| parent | c0af1a72a10ddf77d2b8b93b220fde3c331aa235 (diff) | |
* lib/mkmf.rb (what_type?): guesstimate type.
* ext/etc/etc.c (setup_passwd), ext/etc/extconf.rb: pw_age might be
char*. fixed: [ruby-core:05470]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/etc')
| -rw-r--r-- | ext/etc/etc.c | 6 | ||||
| -rw-r--r-- | ext/etc/extconf.rb | 13 |
2 files changed, 17 insertions, 2 deletions
diff --git a/ext/etc/etc.c b/ext/etc/etc.c index 6f677a6893..3b788d72d7 100644 --- a/ext/etc/etc.c +++ b/ext/etc/etc.c @@ -23,6 +23,10 @@ #include <grp.h> #endif +#ifndef HAVE_TYPE_UID_T +#define uid_t int +#endif + static VALUE sPasswd, sGroup; #ifndef _WIN32 @@ -84,7 +88,7 @@ setup_passwd(pwd) INT2FIX(pwd->pw_quota), #endif #ifdef HAVE_ST_PW_AGE - INT2FIX(pwd->pw_age), + PW_AGE2VAL(pwd->pw_age), #endif #ifdef HAVE_ST_PW_CLASS safe_setup_str(pwd->pw_class), diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb index 16f2da352b..0dc8e7ddac 100644 --- a/ext/etc/extconf.rb +++ b/ext/etc/extconf.rb @@ -8,11 +8,22 @@ if a or b or c have_struct_member('struct passwd', 'pw_gecos', 'pwd.h') have_struct_member('struct passwd', 'pw_change', 'pwd.h') have_struct_member('struct passwd', 'pw_quota', 'pwd.h') - have_struct_member('struct passwd', 'pw_age', 'pwd.h') + if have_struct_member('struct passwd', 'pw_age', 'pwd.h') + case what_type?('struct passwd', 'pw_age', 'pwd.h') + when "string" + f = "safe_setup_str" + when "long long" + f = "LL2NUM" + else + f = "INT2NUM" + end + $defs.push("-DPW_AGE2VAL="+f) + end have_struct_member('struct passwd', 'pw_class', 'pwd.h') have_struct_member('struct passwd', 'pw_comment', 'pwd.h') unless /cygwin/ === RUBY_PLATFORM have_struct_member('struct passwd', 'pw_expire', 'pwd.h') have_struct_member('struct passwd', 'pw_passwd', 'pwd.h') have_struct_member('struct group', 'gr_passwd', 'grp.h') + have_type("uid_t"); create_makefile("etc") end |