Merge from emacs-24; up to 2012-05-07T14:57:18Z!michael.albinus@gmx.de

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

diff --git a/src/sysselect.h b/src/sysselect.h
index f9b9fc0..24bdf46 100644 (file)
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -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 <http://www.gnu.org/licenses/>.  */
 
-#ifdef HAVE_SYS_SELECT_H
-#if defined (DARWIN_OS)
-#undef init_process
-#endif
+#ifndef DOS_NT
 #include <sys/select.h>
-#if defined (DARWIN_OS)
-#define init_process emacs_init_process
-#endif
 #endif
 
 /* The w32 build defines select stuff in w32.h, which is included
@@ -53,3 +47,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define select sys_select
 #endif
 
+#ifdef MSDOS
+#define pselect sys_select
+#endif