Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/sys_pipe.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/sys_pipe.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- src/sys/kern/sys_pipe.c	2008/09/17 14:00:41	1.103
+++ src/sys/kern/sys_pipe.c	2009/01/20 14:50:22	1.104
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_pipe.c,v 1.103 2008/09/17 14:00:41 pooka Exp $	*/
+/*	$NetBSD: sys_pipe.c,v 1.104 2009/01/20 14:50:22 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.103 2008/09/17 14:00:41 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.104 2009/01/20 14:50:22 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -411,11 +411,9 @@ pipeselwakeup(struct pipe *selp, struct 
 	case POLL_HUP:
 		band = POLLHUP;
 		break;
-#if POLL_HUP != POLL_ERR
 	case POLL_ERR:
 		band = POLLERR;
 		break;
-#endif
 	default:
 		band = 0;
 #ifdef DIAGNOSTIC