BSD 4_3_Reno release

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

diff --git a/usr/src/bin/csh/sh.h b/usr/src/bin/csh/sh.h
index 765df59..5d7ace3 100644 (file)
--- a/usr/src/bin/csh/sh.h
+++ b/usr/src/bin/csh/sh.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley Software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley Software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)sh.h        5.3 (Berkeley) 3/29/86
+ *     @(#)sh.h        5.5 (Berkeley) 9/24/89

  */
 
 #include <sys/time.h>
  */
 
 #include <sys/time.h>


@@ -78,7 +78,6 @@ int   shpgrp;                 /* Pgrp of shell */
 int    tpgrp;                  /* Terminal process group */
 /* If tpgrp is -1, leave tty alone! */
 int    opgrp;                  /* Initial pgrp and tty pgrp */
 int    tpgrp;                  /* Terminal process group */
 /* If tpgrp is -1, leave tty alone! */
 int    opgrp;                  /* Initial pgrp and tty pgrp */

-int    oldisc;                 /* Initial line discipline or -1 */

 
 /*
  * These are declared here because they want to be
 
 /*
  * These are declared here because they want to be


@@ -128,8 +127,8 @@ jmp_buf     reslab;
 #define        resexit(a)      copy((char *)reslab, ((char *)(a)), sizeof reslab)
 
 char   *gointr;                /* Label for an onintr transfer */
 #define        resexit(a)      copy((char *)reslab, ((char *)(a)), sizeof reslab)
 
 char   *gointr;                /* Label for an onintr transfer */

-int    (*parintr)();           /* Parents interrupt catch */
-int    (*parterm)();           /* Parents terminate catch */
+sig_t  parintr;                /* Parents interrupt catch */
+sig_t  parterm;                /* Parents terminate catch */

 
 /*
  * Lexical definitions.
 
 /*
  * Lexical definitions.