diff src/sysdep.c @ 100:4be1180a9e89 r20-1b2

Import from CVS: tag r20-1b2
author cvs
date Mon, 13 Aug 2007 09:15:11 +0200
parents 6a378aca36af
children 360340f9fd5f
line wrap: on
line diff
--- a/src/sysdep.c	Mon Aug 13 09:13:58 2007 +0200
+++ b/src/sysdep.c	Mon Aug 13 09:15:11 2007 +0200
@@ -61,7 +61,11 @@
 #include "syswait.h"
 #include "sysdir.h"
 #include "systime.h"
+#if defined(WINDOWSNT)
+#include "syssignal.h"
+#else
 #include <sys/times.h>
+#endif
 
 /* ------------------------------- */
 /*           VMS includes          */
@@ -426,6 +430,7 @@
 
 #ifndef VMS
 #ifndef MSDOS
+#ifndef WINDOWSNT
 /*  Set up the terminal at the other end of a pseudo-terminal that
     we will be controlling an inferior through.
     It should not echo or do line-editing, since that is done
@@ -453,6 +458,7 @@
 #ifdef OLCUC
   s.main.c_oflag &= ~OLCUC;	/* Disable upcasing on output.  */
 #endif
+  s.main.c_oflag &= ~TAB3;	/* Disable tab expansion */
 #if defined (CSIZE) && defined (CS8)
   s.main.c_cflag = (s.main.c_cflag & ~CSIZE) | CS8; /* Don't strip 8th bit */
 #endif
@@ -532,6 +538,7 @@
   }
 #endif /* RTU */
 }
+#endif /* WINDOWSNT */
 #endif /* not MSDOS */
 #endif /* not VMS */
 
@@ -1297,6 +1304,8 @@
 /*        Getting and setting emacs_tty structures        */
 /* ------------------------------------------------------ */
 
+#ifdef HAVE_TTY
+
 /* Set *TC to the parameters associated with the terminal FD.
    Return zero if all's well, or -1 if we ran into an error we
    couldn't deal with.  */
@@ -1436,6 +1445,8 @@
   return 0;
 }
 
+#endif
+
 
 /* ------------------------------------------------------ */
 /*                 Initializing a device                  */
@@ -3412,7 +3423,7 @@
 static int
 get_process_times_1 (long *user_ticks, long *system_ticks)
 {
-#if defined (_SC_CLK_TCK) || defined (CLK_TCK)
+#if defined (_SC_CLK_TCK) || defined (CLK_TCK) && !defined(WINDOWSNT)
   /* We have the POSIX times() function available. */
   struct tms tttt;
   times (&tttt);
@@ -3420,8 +3431,8 @@
   *system_ticks = (long) tttt.tms_stime;
   return 1;
 #elif defined (CLOCKS_PER_SEC)
-  *user_time = (long) clock ();
-  *system_time = 0;
+  *user_ticks = (long) clock ();
+  *system_ticks = 0;
   return 1;
 #else
   return 0;
@@ -3564,6 +3575,38 @@
 
 #if !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
 
+#ifdef WINDOWSNT
+char *sys_siglist[] =
+  {
+    "bum signal!!",
+    "hangup",
+    "interrupt",
+    "quit",
+    "illegal instruction",
+    "trace trap",
+    "iot instruction",
+    "emt instruction",
+    "floating point exception",
+    "kill",
+    "bus error",
+    "segmentation violation",
+    "bad argument to system call",
+    "write on a pipe with no one to read it",
+    "alarm clock",
+    "software termination signal from kill",
+    "status signal",
+    "sendable stop signal not from tty",
+    "stop signal from tty",
+    "continue a stopped process",
+    "child status has changed",
+    "background read attempted from control tty",
+    "background write attempted from control tty",
+    "input record available at control tty",
+    "exceeded CPU time limit",
+    "exceeded file size limit"
+    };
+#endif
+
 #ifdef USG
 #ifdef AIX
 CONST char *sys_siglist[NSIG + 1] =