diff options
| author | pst <pst@FreeBSD.org> | 1996-02-27 19:42:44 +0000 |
|---|---|---|
| committer | pst <pst@FreeBSD.org> | 1996-02-27 19:42:44 +0000 |
| commit | 4659e82debce113fc4eb0454ad94dc14b33ba1ca (patch) | |
| tree | ac3f2bd9ea5edbe4ce35fc76aefbf4136bc14d0c /include/db.h | |
| parent | 912836fc11fb14d3f93b1bbd3d937daf0364a21f (diff) | |
| download | FreeBSD-src-4659e82debce113fc4eb0454ad94dc14b33ba1ca.zip FreeBSD-src-4659e82debce113fc4eb0454ad94dc14b33ba1ca.tar.gz | |
Fix conflicts and merge into mainline (this may get cvs admined out and redone properly by Peter later)
Diffstat (limited to 'include/db.h')
| -rw-r--r-- | include/db.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/db.h b/include/db.h index abf4ddd..cd907c3 100644 --- a/include/db.h +++ b/include/db.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1990, 1993 + * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)db.h 8.4 (Berkeley) 2/21/94 + * @(#)db.h 8.7 (Berkeley) 6/16/94 */ #ifndef _DB_H_ @@ -152,7 +152,7 @@ typedef struct { int lorder; /* byte order */ size_t reclen; /* record length (fixed-length records) */ u_char bval; /* delimiting byte (variable-length records */ - char *bfname; /* btree file name */ + char *bfname; /* btree file name */ } RECNOINFO; #ifdef __DBINTERFACE_PRIVATE |
