(scan_lists): Follow coding convention.

[bpt/emacs.git] / src / sysselect.h

diff --git a/src/sysselect.h b/src/sysselect.h
index 4c52bba..e0e6c48 100644 (file)
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -1,11 +1,12 @@
 /* sysselect.h - System-dependent definitions for the select function.
-   Copyright (C) 1995 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,
@@ -15,11 +16,17 @@ 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., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_SYS_SELECT_H
+#if defined (DARWIN) || defined (MAC_OSX)
+#undef init_process
+#endif
 #include <sys/select.h>
+#if defined (DARWIN) || defined (MAC_OSX)
+#define init_process emacs_init_process
+#endif
 #endif
 
 #ifdef FD_SET
@@ -40,7 +47,7 @@ Boston, MA 02111-1307, 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