ruby
diff --git a/‎ChangeLog‎
Lines changed: 10 additions & 0 deletions b/‎ChangeLog‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎configure.in‎
Lines changed: 40 additions & 4 deletions b/‎configure.in‎
Lines changed: 40 additions & 4 deletions
diff --git a/‎intern.h‎
Lines changed: 5 additions & 5 deletions b/‎intern.h‎
Lines changed: 5 additions & 5 deletions
@@ -1,3 +1,13 @@
+Sun Feb 18 13:11:51 2007  Nobuyoshi Nakada  <[email protected]>
+
+	* configure.in (pid_t, uid_t, gid_t): check if defined.
+
+	* intern.h, process.c, rubyio.h, ext/etc/etc.c, ext/pty/pty.c: use
+	  rb_{pid,uid,gid}_t instead of plain int.  [ruby-dev:30376]
+
+	* ext/etc/extconf.rb (PIDT2NUM, NUM2PIDT, UIDT2NUM, NUM2UIDT, GIDT2NUM,
+	  NUM2GIDT): moved to configure.in.
+
 Fri Feb 16 21:34:33 2007  Koichi Sasada  <[email protected]>
 
 	* object.c (rb_obj_ivar_set/get/defined): fix to check :@_v/C id.
 
@@ -239,10 +239,46 @@ AC_CHECK_SIZEOF(float, 4)
 AC_CHECK_SIZEOF(double, 8)
 AC_CHECK_SIZEOF(time_t, 0)
 
-for id in pid_t gid_t uid_t; do
-    AC_CHECK_TYPE($id, [typ=$id], [typ=int])
-    AC_DEFINE_UNQUOTED(rb_$id, $typ)
-done
+AC_DEFUN([RUBY_REPLACE_TYPE], [dnl
+    AC_CHECK_SIZEOF($1, 0, $3)
+    u=
+    size=$ac_cv_sizeof_[$1]
+    if test $size -gt 0; then
+	typ=$1
+	AC_COMPILE_IFELSE(
+	    [AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT]
+				      [$3], [($typ)-1 > 0])],
+	    [u=U])
+    else
+	typ=$2
+	size=$ac_cv_sizeof_[$2]
+    fi
+    if test $size -gt $ac_cv_sizeof_long; then
+	f=LL
+    elif test $size = $ac_cv_sizeof_long; then
+	f=LONG
+    else
+	f=INT
+    fi
+    AC_DEFINE_UNQUOTED(rb_$1, $typ)
+    AC_DEFINE_UNQUOTED(SIZEOF_RB_`echo $1 | tr a-z A-Z`,
+		       SIZEOF_`echo $typ | tr a-z A-Z`)
+    typ=`echo $1 | tr a-z A-Z | tr -d _`
+    AC_DEFINE_UNQUOTED(${typ}2NUM, ${u}${f}2NUM)
+    AC_DEFINE_UNQUOTED(NUM2${typ}, NUM2${u}${f})
+])
+RUBY_REPLACE_TYPE(pid_t, int, [
+#include <sys/types.h>
+#include <unistd.h>
+])
+RUBY_REPLACE_TYPE(uid_t, int, [
+#include <sys/types.h>
+#include <pwd.h>
+])
+RUBY_REPLACE_TYPE(gid_t, int, [
+#include <sys/types.h>
+#include <grp.h>
+])
 
 AC_CACHE_CHECK(for prototypes, rb_cv_have_prototypes,
   [AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],
 
@@ -424,13 +424,13 @@ int rb_proc_exec_n(int, VALUE*, const char*);
 int rb_proc_exec(const char*);
 VALUE rb_check_argv(int, VALUE*);
 int rb_exec(const struct rb_exec_arg*);
-int rb_fork(int*, int (*)(void*), void*);
+rb_pid_t rb_fork(int*, int (*)(void*), void*);
 VALUE rb_f_exec(int,VALUE*);
-int rb_waitpid(int,int*,int);
-void rb_syswait(int);
-int rb_spawn(int, VALUE*);
+rb_pid_t rb_waitpid(rb_pid_t pid, int *status, int flags);
+void rb_syswait(rb_pid_t pid);
+rb_pid_t rb_spawn(int, VALUE*);
 VALUE rb_proc_times(VALUE);
-VALUE rb_detach_process(int);
+VALUE rb_detach_process(pid_t pid);
 /* range.c */
 VALUE rb_range_new(VALUE, VALUE, int);
 VALUE rb_range_beg_len(VALUE, long*, long*, long, int);