Merge from gnus--devo--0

[gnu-emacs] / src / sysselect.h

diff --git a/src/sysselect.h b/src/sysselect.h
index ba204dafe3f13667ca1ae349eb2836d3bc3ca8cb..e0e6c48ca9dafce6fe2d3a01985fb315b1d6bce0 100644 (file)
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -1,12 +1,12 @@
 /* sysselect.h - System-dependent definitions for the select function.
-   Copyright (C) 1995, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -47,7 +47,7 @@ Boston, MA 02110-1301, USA.  */
 #define FD_ZERO(p) (*(p) = 0)
 #endif /* no FD_SET */
 
-#if !defined (HAVE_SELECT) || defined (BROKEN_SELECT_NON_X)
+#if !defined (HAVE_SELECT)
 #define select sys_select
 #endif