4.4BSD snapshot (revision 8.1); add 1993 to copyright

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

diff --git a/usr/src/usr.bin/ex/ex.h b/usr/src/usr.bin/ex/ex.h
index 85c37be..997c3ff 100644 (file)
--- a/usr/src/usr.bin/ex/ex.h
+++ b/usr/src/usr.bin/ex/ex.h
@@ -1,9 +1,10 @@
-/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * %sccs.include.proprietary.c%

  *
  *

- *     @(#)ex.h        7.8 (Berkeley) %G%
+ *     @(#)ex.h        8.1 (Berkeley) %G%

  */
 
 #ifdef V6
  */
 
 #ifdef V6


@@ -158,7 +159,9 @@ extern       struct option options[NOPTS + 1];
 #      define  BUFSIZ  512
 #  endif
 # endif
 #      define  BUFSIZ  512
 #  endif
 # endif

+# ifndef NULL

 #      define  NULL    0
 #      define  NULL    0

+# endif

 #      define  EOF     -1
 #endif
 
 #      define  EOF     -1
 #endif
 


@@ -175,9 +178,9 @@ extern       struct option options[NOPTS + 1];
 #ifndef vms
 #undef CTRL
 #endif
 #ifndef vms
 #undef CTRL
 #endif

-#define        CTRL(c) ('c' & 037)
-#define        NL      CTRL(j)
-#define        CR      CTRL(m)
+#define        CTRL(c) (c & 037)
+#define        NL      CTRL('j')
+#define        CR      CTRL('m')

 #define        DELETE  0177            /* See also ATTN, QUIT in ex_tune.h */
 #define        ESCAPE  033
 
 #define        DELETE  0177            /* See also ATTN, QUIT in ex_tune.h */
 #define        ESCAPE  033
 


@@ -342,7 +345,7 @@ var line    *undadot;       /* If we saved all lines, dot reverts here */
 extern int     (*Outchar)();
 extern int     (*Pline)();
 extern int     (*Put_char)();
 extern int     (*Outchar)();
 extern int     (*Pline)();
 extern int     (*Put_char)();

-var    int     (*oldhup)();
+sig_t  oldhup;

 int    (*setlist())();
 int    (*setnorm())();
 int    (*setnorm())();
 int    (*setlist())();
 int    (*setnorm())();
 int    (*setnorm())();


@@ -390,16 +393,16 @@ off_t     lseek();
 int    normchar();
 int    normline();
 int    numbline();
 int    normchar();
 int    normline();
 int    numbline();

-var    int     (*oldquit)();
-int    onhup();
-int    onintr();
-int    onsusp();
+var    void (*oldquit)();
+void   onhup();
+void   onintr();
+void   onsusp();

 int    putch();
 int    shift();
 int    termchar();
 int    vfilter();
 #ifdef CBREAK
 int    putch();
 int    shift();
 int    termchar();
 int    vfilter();
 #ifdef CBREAK

-int    vintr();
+void   vintr();

 #endif
 int    vputch();
 int    vshftop();
 #endif
 int    vputch();
 int    vshftop();