diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 1996-11-30 21:09:23 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 1996-11-30 21:09:23 +0000 |
commit | 67e9b81bf2c3acfeba94fdb222f197904c16cfef (patch) | |
tree | d3c86e29fa60fc56eb72f9263478434f9b2f3607 /usr.bin/make/buf.h | |
parent | 66030e0876e2f9722b759c1df2901e526a7be102 (diff) |
Sync with NetBSD:
- Merge in FreeBSD and Lite2 changes.
- Fix bug where a non-archive target with a .a suffix would always
be considered to be out of date, since it does not have a TOC.
- Fix NetBSD PR #2930: declare missing variable.
Diffstat (limited to 'usr.bin/make/buf.h')
-rw-r--r-- | usr.bin/make/buf.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h index e345eadf032..52899a37a2c 100644 --- a/usr.bin/make/buf.h +++ b/usr.bin/make/buf.h @@ -1,5 +1,5 @@ -/* $OpenBSD: buf.h,v 1.2 1996/06/26 05:36:26 deraadt Exp $ */ -/* $NetBSD: buf.h,v 1.5 1995/06/14 15:18:53 christos Exp $ */ +/* $OpenBSD: buf.h,v 1.3 1996/11/30 21:08:51 millert Exp $ */ +/* $NetBSD: buf.h,v 1.6 1996/11/06 17:59:00 christos Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)buf.h 5.4 (Berkeley) 12/28/90 + * from: @(#)buf.h 8.1 (Berkeley) 6/6/93 */ /*- @@ -69,7 +69,7 @@ typedef struct Buffer { #define BUF_ERROR 256 void Buf_OvAddByte __P((Buffer, int)); -void Buf_AddBytes __P((Buffer, int, Byte *)); +void Buf_AddBytes __P((Buffer, int, const Byte *)); void Buf_UngetByte __P((Buffer, int)); void Buf_UngetBytes __P((Buffer, int, Byte *)); int Buf_GetByte __P((Buffer)); @@ -79,5 +79,6 @@ void Buf_Discard __P((Buffer, int)); int Buf_Size __P((Buffer)); Buffer Buf_Init __P((int)); void Buf_Destroy __P((Buffer, Boolean)); +void Buf_ReplaceLastByte __P((Buffer, Byte)); #endif /* _BUF_H */ |