X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/acaf905b1130aae80fa59d2c861ffd4c8eb75486..9b017563288c753d4e9c2f2a83cd20b885574b17:/src/sysselect.h
diff --git a/src/sysselect.h b/src/sysselect.h
index f9b9fc00b3..b76e71a3a7 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -1,5 +1,5 @@
/* sysselect.h - System-dependent definitions for the select function.
- Copyright (C) 1995, 2001-2012 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2001-2014 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -16,14 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see . */
-#ifdef HAVE_SYS_SELECT_H
-#if defined (DARWIN_OS)
-#undef init_process
-#endif
+#ifndef DOS_NT
#include
-#if defined (DARWIN_OS)
-#define init_process emacs_init_process
-#endif
#endif
/* The w32 build defines select stuff in w32.h, which is included
@@ -31,15 +25,12 @@ along with GNU Emacs. If not, see . */
definitions in w32.h are incompatible with the below. */
#ifndef WINDOWSNT
#ifdef FD_SET
-#ifdef FD_SETSIZE
-#define MAXDESC FD_SETSIZE
-#else
-#define MAXDESC 64
+#ifndef FD_SETSIZE
+#define FD_SETSIZE 64
#endif
-#define SELECT_TYPE fd_set
#else /* no FD_SET */
-#define MAXDESC 32
-#define SELECT_TYPE int
+#define FD_SETSIZE 32
+typedef int fd_set;
/* Define the macros to access a single-int bitmap of descriptors. */
#define FD_SET(n, p) (*(p) |= (1 << (n)))
@@ -53,3 +44,6 @@ along with GNU Emacs. If not, see . */
#define select sys_select
#endif
+#ifdef MSDOS
+#define pselect sys_select
+#endif