(compilation-directory-matcher): Doc fix (Nil -> nil).

[gnu-emacs] / src / sysselect.h

diff --git a/src/sysselect.h b/src/sysselect.h
index 5aa9eb4aee71d2b567c24ed03c166049d312c29e..ba204dafe3f13667ca1ae349eb2836d3bc3ca8cb 100644 (file)
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -1,5 +1,6 @@
 /* sysselect.h - System-dependent definitions for the select function.
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -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
+#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