Re: [Emacs-diffs] /srv/bzr/emacs/trunk r101633: Add fd handling with callbacks to select, dbus needs it for async operation.

[Eli Zaretskii]

> Date: Sun, 26 Sep 2010 13:17:33 -0400
> From: address@hidden
> 
> @@ -7023,12 +7086,10 @@
>  void
>  add_keyboard_wait_descriptor (int desc)
>  {
> -#ifdef subprocesses
>    FD_SET (desc, &input_wait_mask);
>    FD_SET (desc, &non_process_wait_mask);
> -  if (desc > max_keyboard_desc)
> -    max_keyboard_desc = desc;
> -#endif
> +  if (desc > max_input_desc)
> +    max_input_desc = desc;
>  }
>  
>  /* From now on, do not expect DESC to give keyboard input.  */
> @@ -7036,20 +7097,16 @@
>  void
>  delete_keyboard_wait_descriptor (int desc)
>  {
> -#ifdef subprocesses
>    int fd;
> -  int lim = max_keyboard_desc;
> +  int lim = max_input_desc;
>  
>    FD_CLR (desc, &input_wait_mask);
>    FD_CLR (desc, &non_process_wait_mask);
>  
> -  if (desc == max_keyboard_desc)
> +  if (desc == max_input_desc)
>      for (fd = 0; fd < lim; fd++)
> -      if (FD_ISSET (fd, &input_wait_mask)
> -       && !FD_ISSET (fd, &non_keyboard_wait_mask)
> -       && !FD_ISSET (fd, &gpm_wait_mask))
> -     max_keyboard_desc = fd;
> -#endif /* subprocesses */

The changes that remove the "#ifdef subprocesses" conditionals will
probably break the MSDOS build, because input_wait_mask etc. are only
defined "#ifdef subprocesses".  The functions
add_keyboard_wait_descriptor and delete_keyboard_wait_descriptor are
supposed to be no-ops for the MSDOS build.