finally works (updated for 4.1c and merged with sun)

[unix-history] / usr / src / bin / csh / csh.h

diff --git a/usr/src/bin/csh/csh.h b/usr/src/bin/csh/csh.h
index 5bd3859..3f40060 100644 (file)
--- a/usr/src/bin/csh/csh.h
+++ b/usr/src/bin/csh/csh.h
@@ -1,9 +1,8 @@
-/* csh.h 4.4 %G% */
+/* csh.h 4.5 82/12/30 */

 
 #include "sh.local.h"
 
 #include "sh.local.h"

-#ifdef VMUNIX
-#include <sys/vtimes.h>
-#endif
+#include <time.h>
+#include <resource.h>

 
 /*
  * C shell
 
 /*
  * C shell


@@ -59,6 +58,7 @@ char  *err;                   /* Error message from scanner/parser */
 int    errno;                  /* Error from C library routines */
 char   *shtemp;                /* Temp name for << shell files in /tmp */
 time_t time0;                  /* Time at which the shell started */
 int    errno;                  /* Error from C library routines */
 char   *shtemp;                /* Temp name for << shell files in /tmp */
 time_t time0;                  /* Time at which the shell started */

+struct rusage ru0;

 
 /*
  * Miscellany
 
 /*
  * Miscellany


@@ -199,11 +199,7 @@ struct     wordent {
  * process id's from `$$', and modified variable values (from qualifiers
  * during expansion in sh.dol.c) here.
  */
  * process id's from `$$', and modified variable values (from qualifiers
  * during expansion in sh.dol.c) here.
  */

-#ifdef VMUNIX

 char   labuf[BUFSIZ];
 char   labuf[BUFSIZ];

-#else
-char   labuf[256];
-#endif

 
 char   *lap;
 
 
 char   *lap;
 


@@ -437,10 +433,6 @@ char       **Vav;
 char   *Vdp;
 #endif
 
 char   *Vdp;
 #endif
 

-#ifdef VMUNIX
-struct vtimes zvms;
-#endif
-

 char   **evalvec;
 char   *evalp;
 
 char   **evalvec;
 char   *evalp;