From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] /srv/bzr/emacs/trunk r101633: Add fd handling with callbacks to select, dbus needs it for async operation. Date: Sun, 26 Sep 2010 20:28:09 +0200 Message-ID: <83sk0wqs06.fsf@gnu.org> References: Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1285526752 27975 80.91.229.12 (26 Sep 2010 18:45:52 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 26 Sep 2010 18:45:52 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?UTF-8?B?SmFuIERqw6Rydg==?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Sep 26 20:45:49 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OzwEP-0007eD-HP for ged-emacs-devel@m.gmane.org; Sun, 26 Sep 2010 20:45:49 +0200 Original-Received: from localhost ([127.0.0.1]:44761 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ozvxx-0003Zn-Nx for ged-emacs-devel@m.gmane.org; Sun, 26 Sep 2010 14:28:49 -0400 Original-Received: from [140.186.70.92] (port=34114 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ozvxk-0003Tz-LY for emacs-devel@gnu.org; Sun, 26 Sep 2010 14:28:39 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OzvxS-0007FC-90 for emacs-devel@gnu.org; Sun, 26 Sep 2010 14:28:19 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:64886) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OzvxS-0007F4-1n for emacs-devel@gnu.org; Sun, 26 Sep 2010 14:28:18 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0L9D008009YH1N00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Sun, 26 Sep 2010 20:28:02 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.229.212.132]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L9D007PN9YOSR80@a-mtaout21.012.net.il>; Sun, 26 Sep 2010 20:28:01 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:130925 Archived-At: > Date: Sun, 26 Sep 2010 13:17:33 -0400 > From: emacs-diffs-request@gnu.org > > @@ -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.