From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-8801-listarch-libc-hacker=sources.redhat.com@sourceware.org>
Received: (qmail 20099 invoked by alias); 19 Jan 2006 14:56:17 -0000
Received: (qmail 20080 invoked by uid 22791); 19 Jan 2006 14:56:16 -0000
X-Spam-Check-By: sourceware.org
Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26)
    by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 19 Jan 2006 14:56:14 +0000
Received: from sunsite.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1])
	by sunsite.mff.cuni.cz (8.13.1/8.13.1) with ESMTP id k0JEu4Pe016149;
	Thu, 19 Jan 2006 15:56:04 +0100
Received: (from jj@localhost)
	by sunsite.mff.cuni.cz (8.13.1/8.13.1/Submit) id k0JEu4EI016146;
	Thu, 19 Jan 2006 15:56:04 +0100
Date: Thu, 19 Jan 2006 14:56:00 -0000
From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>, Roland McGrath <roland@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] Fix misc/pselect.c for tst-cancel-wrappers
Message-ID: <20060119145604.GK4625@sunsite.mff.cuni.cz>
Reply-To: Jakub Jelinek <jakub@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sourceware.org>
List-Help: <mailto:libc-hacker-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: libc-hacker-owner@sourceware.org
X-SW-Source: 2006-01/txt/msg00079.txt.bz2

Hi!

We also need to tell tst-cancel-wrappers that pselect.c handles
cancellation indirectly through __select cancellation.

2006-01-19  Jakub Jelinek  <jakub@redhat.com>

	* misc/pselect.c: Include sysdep-cancel.h again.  Add
	LIBC_CANCEL_HANDLED ().

--- libc/misc/pselect.c.jj	2006-01-19 09:45:10.000000000 +0100
+++ libc/misc/pselect.c	2006-01-19 14:18:50.000000000 +0100
@@ -22,6 +22,7 @@
 #include <stddef.h>	/* For NULL.  */
 #include <sys/time.h>
 #include <sys/select.h>
+#include <sysdep-cancel.h>
 
 
 /* Check the first NFDS descriptors each in READFDS (if not NULL) for read
@@ -63,3 +64,5 @@ __pselect (int nfds, fd_set *readfds, fd
 }
 weak_alias (__pselect, pselect)
 strong_alias (__pselect, __libc_pselect)
+/* __select handles cancellation.  */
+LIBC_CANCEL_HANDLED ();

	Jakub