Re: HAVE_SYS_SELECT of sysselect.h

[YAMAMOTO Mitsuharu]

>>>>> On Sat, 30 Apr 2005 04:02:12 +0900, Nozomu Ando <address@hidden> said:

> -#ifdef HAVE_SYS_SELECT
> +#ifdef HAVE_SYS_SELECT_H

I can't test it with Mac OS X 10.4 Tiger now, but I think this is the
best way to solve the "Can't compile on Tiger" problem.

But with the above change, I could not compile xmenu.c (for X11 build)
or mac.c (for Carbon build) at least when compiling with the GCC
option "-g" on Mac OS X 10.3.9.

In file included from /usr/include/mach/mach_init.h:76,
                 from /usr/include/mach/mach.h:64,
                 from /usr/include/sys/event.h:154,
                 from /usr/include/sys/select.h:71,
                 from /SOME/WHERE/emacs/src/sysselect.h:22,
                 from /SOME/WHERE/emacs/src/mac.c:31:
/usr/include/mach/mach_traps.h:103: error: conflicting types for 
`emacs_init_process'
/SOME/WHERE/emacs/src/lisp.h:3031: error: previous declaration of 
`emacs_init_process'

In file included from /usr/include/mach/mach_init.h:76,
                 from /usr/include/mach/mach.h:64,
                 from /usr/include/sys/event.h:154,
                 from /usr/include/sys/select.h:71,
                 from /SOME/WHERE/emacs/src/sysselect.h:22,
                 from /SOME/WHERE/emacs/src/xmenu.c:51:
/usr/include/mach/mach_traps.h:103: error: conflicting types for 
`emacs_init_process'
/SOME/WHERE/emacs/src/lisp.h:3031: error: previous declaration of 
`emacs_init_process'

The following patch seems to fix it, but is there any more elegant
way?

                                     YAMAMOTO Mitsuharu
                                address@hidden

*** sysselect.h.~1.4.~  Mon May  2 08:55:47 2005
--- sysselect.h Mon May  2 10:48:14 2005
***************
*** 19,25 ****
--- 19,31 ----
  Boston, MA 02111-1307, USA.  */
  
  #ifdef HAVE_SYS_SELECT_H
+ #if defined (DARWIN) || defined (MAC_OSX)
+ #undef init_process
+ #endif
  #include <sys/select.h>
+ #if defined (DARWIN) || defined (MAC_OSX)
+ #define init_process emacs_init_process
+ #endif
  #endif
  
  #ifdef FD_SET