summaryrefslogtreecommitdiff
path: root/src/sysselect.h
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2012-06-30 18:32:51 +0300
committerEli Zaretskii <eliz@gnu.org>2012-06-30 18:32:51 +0300
commit0d23c240ea378d9a29042266216f4cf25151a04d (patch)
treedc3d25374540cc607085f405c4692d976ec14834 /src/sysselect.h
parent3cfbebba71090f6ea0c2ca4a6056a3e645cee2e8 (diff)
downloademacs-0d23c240ea378d9a29042266216f4cf25151a04d.tar.gz
Adapt the MS-DOS build to the latest changes.
msdos/mainmake.v2 (bootstrap-clean): Do a maintainer-clean in lib, not bootstrap-clean (which doesn't exist). msdos/inttypes.h (PRIuMAX) [__DJGPP__ < 2.04]: Define to "llu". msdos/sedleim.inp (MKDIR_P): Edit to DOS "md" command. msdos/sed1v2.inp: (LIB_CLOCK_GETTIME): Edit to empty. Remove lines that invoke PAXCTL. (clean): Fix recipe not to run Unixy shell commands. msdos/sed2v2.inp (GETTIMEOFDAY_TIMEZONE): Edit to 'struct timezone'. (HAVE_STRNCASECMP): Edit to 1. msdos/sed3v2.inp (LIB_CLOCK_GETTIME): Edit to empty. (C_SWITCH_SYSTEM): Add "-I../msdos". msdos/sedlibmk.inp (GNULIB_GETTIMEOFDAY, GNULIB_PSELECT) (GNULIB_SELECT, HAVE_STRUCT_TIMEVAL, HAVE_SYS_SELECT_H) (HAVE_SYS_TIME_H, NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H) (NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H, NEXT_SYS_SELECT_H) (NEXT_SYS_TIME_H, REPLACE_GETTIMEOFDAY, REPLACE_PSELECT) (REPLACE_STRUCT_TIMEVAL): Edit to appropriate values. (BUILT_SOURCES): Edit out sys/select.h and sys/time.h. (mostlyclean-local, distclean-generic): Fix recipe not to run Unixy shell commands. src/sysselect.h [DOS_NT]: Don't include sys/select.h. src/s/ms-w32.h (select, pselect): Don't define here, they are defined in sysselect.h src/sysselect.h (pselect) [!HAVE_PSELECT]: Redirect to sys_select. src/sysdep.c: Don't include dos.h and dosfns.h. src/process.c (sys_select): src/msdos.c (sys_select): Accept one more argument and ignore it. src/msdos.c (event_timestamp, sys_select): Use gnulib's gettime; adapt data types and code to that. src/dosfns.c: src/msdos.c (gettime, settime): Define away the prototypes in dos.h, which clashes with the gnulib function of the same name. lisp/emacs-lisp/timer.el (timer-until): Subtract results of float-time, instead of taking float-time of the result of time-subtract, since float-time signals an error for negative time arguments.
Diffstat (limited to 'src/sysselect.h')
-rw-r--r--src/sysselect.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/sysselect.h b/src/sysselect.h
index 328372d427c..27a38fd687f 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -19,7 +19,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#if defined (DARWIN_OS)
#undef init_process
#endif
-#ifndef WINDOWSNT
+#ifndef DOS_NT
#include <sys/select.h>
#endif
#if defined (DARWIN_OS)
@@ -52,3 +52,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#if !defined (HAVE_SELECT)
#define select sys_select
#endif
+
+#ifndef HAVE_PSELECT
+#define pselect sys_select
+#endif