X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/59ce725a3b68cbc324f01bc8dc5f9e07286431d1..6340c70eb32758be2c3ca9059a3fb75bb9a79e72:/src/sysselect.h

diff --git a/src/sysselect.h b/src/sysselect.h
index a866af3100..8b70fd779a 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -1,13 +1,13 @@
 /* sysselect.h - System-dependent definitions for the select function.
    Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008  Free Software Foundation, Inc.
+                 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+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 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,16 +15,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef HAVE_SYS_SELECT_H
-#if defined (DARWIN) || defined (MAC_OSX)
+#if defined (DARWIN_OS)
 #undef init_process
 #endif
 #include <sys/select.h>
-#if defined (DARWIN) || defined (MAC_OSX)
+#if defined (DARWIN_OS)
 #define init_process emacs_init_process
 #endif
 #endif
@@ -47,7 +45,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