Re: [PATCH] Win32: Ruby & APR; build problems for Ruby Subversion SWIG bindings

Thanks for the quick response!

> > Index: configure.in
> > ===================================================================
> > RCS file: /src/ruby/configure.in,v
> > retrieving revision 1.275
> > diff -u -r1.275 configure.in
> > --- configure.in      30 Apr 2005 02:59:41 -0000      1.275
> > +++ configure.in      14 May 2005 07:45:02 -0000
> > @@ -226,6 +226,8 @@
> >  AC_CHECK_SIZEOF(double, 8)
> >  AC_CHECK_SIZEOF(time_t, 0)
> >
> > +AC_CHECK_TYPES([pid_t, gid_t, uid_t])
> 
> I think AC_TYPE_UID_T and AC_TYPE_PID_T also would be 
> needed to remove.

Yes. Though I have not been able to find any reference to
AC_TYPE_PID_T, I did remove AC_TYPE_UID_T.

> > Index: process.c
> > ===================================================================
> > RCS file: /src/ruby/process.c,v
> > retrieving revision 1.129
> > diff -u -r1.129 process.c
> > --- process.c 4 Mar 2005 06:47:41 -0000       1.129
> > +++ process.c 14 May 2005 07:45:03 -0000
> > @@ -1847,14 +1847,14 @@
> >      if (pid < 0) rb_sys_fail(0);
> >      return INT2FIX(pid);
> >  #elif defined(HAVE_SETPGRP) && defined(TIOCNOTTY)
> > -  pid_t pid;
> > +  rb_pid_t pid;
> >    int ret;
> >
> >    rb_secure(2);
> >    pid = getpid();
> >  #if defined(SETPGRP_VOID)
> >    ret = setpgrp();
> > -  /* If `pid_t setpgrp(void)' is equivalent to setsid(),
> > +  /* If `rb_pid_t setpgrp(void)' is equivalent to setsid(),
> 
> This is overdone, isn't it?

Yes. removed.
 
> > Index: ruby.h
> > ===================================================================
> > RCS file: /src/ruby/ruby.h,v
> > retrieving revision 1.111
> > diff -u -r1.111 ruby.h
> > --- ruby.h    30 Apr 2005 02:59:41 -0000      1.111
> > +++ ruby.h    14 May 2005 07:45:03 -0000
> > @@ -82,6 +82,25 @@
> >  typedef unsigned long VALUE;
> >  typedef unsigned long ID;
> >
> > +#if ! HAVE_PID_T
> > +  typedef int rb_pid_t;
> > +#else
> > +  typedef pid_t rb_pid_t;
> > +#endif
> 
> Why not #ifdef?
Error on my part. Corrected in the attached patch.


Updated patch attached.

The log:

[[[
Resolve possible type definition conflicts by defining types in
the rb_ namespace instead of defining POSIX type names.

* configure.in: Check for the availability of pid_t, gid_t and uid_t and
  remove AC_TYPE_UID_T.

* defines.h: Remove pid_t typedef.

* ruby.h: Define rb_pid_t, rb_gid_t and rb_uid_t in accordance with
 the available system types.

* process.c: Change instances of pid_t and gid_t to their rb_*
 counterparts.

* ext/pty/pty.c: Change pid_t to rb_pid_t.

* vms/config.h: Define HAVE_{P,G,U}ID_T to 1.

* win32/Makefile.sub: Remove #define for {g,u}id_t.

* win32/win32.c: Change pid_t to rb_pid_t.

* wince/Makefile.sub: Remove #define for {g,u}id_t.

* wince/sys/types.h: Remove definitions of {p,g,u}id_t.

]]]