summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/etc/etc.c6
-rw-r--r--ext/etc/extconf.rb13
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