update copyright notice

[unix-history] / usr / src / usr.bin / more / less.h

diff --git a/usr/src/usr.bin/more/less.h b/usr/src/usr.bin/more/less.h
index 765c108..7716371 100644 (file)
--- a/usr/src/usr.bin/more/less.h
+++ b/usr/src/usr.bin/more/less.h
@@ -3,39 +3,29 @@
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *

- * This code is derived from software contributed to Berkeley by
- * Mark Nudleman.
- * 

  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
  * advertising materials, and other materials related to such
  * distribution and use acknowledge that the software was developed
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
  * advertising materials, and other materials related to such
  * distribution and use acknowledge that the software was developed

- * by the University of California, Berkeley.  The name of the
+ * by Mark Nudleman and the University of California, Berkeley.  The
+ * name of Mark Nudleman or the

  * University may not be used to endorse or promote products derived
  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * University may not be used to endorse or promote products derived
  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)less.h      5.1 (Berkeley) %G%
+ *     @(#)less.h      5.6 (Berkeley) %G%

  */
 
 /*
  * Standard include file for "less".
  */
 
  */
 
 /*
  * Standard include file for "less".
  */
 

-/*
- * Include the file of compile-time options.
- */
-#include "defines.h"
-

 /*
  * Language details.
  */
 /*
  * Language details.
  */

-#if !VOID
-#define        void  int
-#endif

 #define        public          /* PUBLIC FUNCTION */
 
 /*
 #define        public          /* PUBLIC FUNCTION */
 
 /*


@@ -60,9 +50,6 @@ typedef       int             HANDLER;
 #define        FILENAME        128     /* Max size of a filename */
 
 #define        EOI             (0)
 #define        FILENAME        128     /* Max size of a filename */
 
 #define        EOI             (0)

-#ifndef NULL
-#define        NULL            (0)
-#endif

 
 #define        READ_INTR       (-2)
 
 
 #define        READ_INTR       (-2)
 


@@ -88,10 +75,12 @@ typedef     int             HANDLER;
 #define        BE_CHAR         '\204'  /* Exit boldface mode */
 
 #define        CONTROL(c)              ((c)&037)
 #define        BE_CHAR         '\204'  /* Exit boldface mode */
 
 #define        CONTROL(c)              ((c)&037)

-#define        SIGNAL(sig,func)        signal(sig,func)
+
+#include <sys/param.h>
+#include <sys/file.h>

 
 /* Library function declarations */
 
 /* Library function declarations */

-offset_t lseek();
+off_t lseek();

 char *calloc();
 
 #include "funcs.h"
 char *calloc();
 
 #include "funcs.h"