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/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.
  src/ w32proc.c (sys_select): Accept and ignore one more argument.
  src/w32.c (emacs_gnutls_pull): Call select with one more argument.

  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.

1 files changed, 15 insertions, 14 deletions

diff --git a/src/msdos.c b/src/msdos.c
index a79fad0ccd4..4dec901988b 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -31,7 +31,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <time.h>
 #include <sys/param.h>
 #include <sys/time.h>
+/* gettine and settime in dos.h clash with their namesakes from
+   gnulib, so we move out of our way the prototypes in dos.h.  */
+#define gettime dos_h_gettime_
+#define settime dos_h_settime_
 #include <dos.h>
+#undef gettime
+#undef settime
 #include <errno.h>
 #include <sys/stat.h>    /* for _fixpath */
 #include <unistd.h>      /* for chdir, dup, dup2, etc. */
@@ -103,18 +109,18 @@ int _crt0_startup_flags = (_CRT0_FLAG_UNIX_SBRK | _CRT0_FLAG_FILL_SBRK_MEMORY);
 
 #endif /* not SYSTEM_MALLOC */
 
+/* Return the current timestamp in milliseconds since midnight.  */
 static unsigned long
 event_timestamp (void)
 {
-  struct time t;
+  struct timespec t;
   unsigned long s;
 
   gettime (&t);
-  s = t.ti_min;
-  s *= 60;
-  s += t.ti_sec;
+  s = t.tv_sec;
+  s %= 86400;
   s *= 1000;
-  s += t.ti_hund * 10;
+  s += t.tv_nsec * 1000000;
 
   return s;
 }
@@ -4097,10 +4103,10 @@ dos_yield_time_slice (void)
    because wait_reading_process_output takes care of that.  */
 int
 sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
-            EMACS_TIME *timeout)
+            EMACS_TIME *timeout, void *ignored)
 {
   int check_input;
-  struct time t;
+  struct timespec t;
 
   check_input = 0;
   if (rfds)
@@ -4130,18 +4136,13 @@ sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
       EMACS_TIME clnow, cllast, cldiff;
 
       gettime (&t);
-      EMACS_SET_SECS_USECS (cllast, t.ti_sec, t.ti_hund * 10000L);
+      EMACS_SET_SECS_NSECS (cllast, t.tv_sec, t.tv_nsec);
 
       while (!check_input || !detect_input_pending ())
         {
           gettime (&t);
-          EMACS_SET_SECS_USECS (clnow, t.ti_sec, t.ti_hund * 10000L);
+          EMACS_SET_SECS_NSECS (clnow, t.tv_sec, t.tv_nsec);
           EMACS_SUB_TIME (cldiff, clnow, cllast);
-
-          /* When seconds wrap around, we assume that no more than
-             1 minute passed since last `gettime'.  */
-          if (EMACS_TIME_SIGN (cldiff) < 0)
-            EMACS_SET_SECS (cldiff, EMACS_SECS (cldiff) + 60);
           EMACS_SUB_TIME (*timeout, *timeout, cldiff);
 
           /* Stop when timeout value crosses zero.  */