merge lite-2

This commit is contained in:
perry 1998-02-02 03:32:51 +00:00
parent 172b242837
commit 3da5be9552
2 changed files with 22 additions and 22 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: ftell.c,v 1.8 1998/01/19 07:38:48 jtc Exp $ */
/* $NetBSD: ftell.c,v 1.9 1998/02/02 03:32:51 perry Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -39,9 +39,9 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)ftell.c 8.1 (Berkeley) 6/4/93";
static char sccsid[] = "@(#)ftell.c 8.2 (Berkeley) 5/4/95";
#else
__RCSID("$NetBSD: ftell.c,v 1.8 1998/01/19 07:38:48 jtc Exp $");
__RCSID("$NetBSD: ftell.c,v 1.9 1998/02/02 03:32:51 perry Exp $");
#endif
#endif /* LIBC_SCCS and not lint */

View File

@ -1,4 +1,4 @@
/* $NetBSD: local.h,v 1.6 1997/07/13 20:15:14 christos Exp $ */
/* $NetBSD: local.h,v 1.7 1998/02/02 03:32:52 perry Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -35,7 +35,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)local.h 8.2 (Berkeley) 1/2/94
* @(#)local.h 8.3 (Berkeley) 7/3/94
*/
/*
@ -43,24 +43,24 @@
* in particular, macros and private variables.
*/
int __sflush __P((FILE *));
FILE *__sfp __P((void));
int __srefill __P((FILE *));
int __sread __P((void *, char *, int));
int __swrite __P((void *, char const *, int));
fpos_t __sseek __P((void *, fpos_t, int));
int __sclose __P((void *));
void __sinit __P((void));
void _cleanup __P((void));
void (*__cleanup) __P((void));
void __smakebuf __P((FILE *));
int __swhatbuf __P((FILE *, size_t *, int *));
int _fwalk __P((int (*)(FILE *)));
char *_mktemp __P((char *));
int __swsetup __P((FILE *));
int __sflags __P((const char *, int *));
extern int __sflush __P((FILE *));
extern FILE *__sfp __P((void));
extern int __srefill __P((FILE *));
extern int __sread __P((void *, char *, int));
extern int __swrite __P((void *, char const *, int));
extern fpos_t __sseek __P((void *, fpos_t, int));
extern int __sclose __P((void *));
extern void __sinit __P((void));
extern void _cleanup __P((void));
extern void (*__cleanup) __P((void));
extern void __smakebuf __P((FILE *));
extern int __swhatbuf __P((FILE *, size_t *, int *));
extern int _fwalk __P((int (*)(FILE *)));
extern char *_mktemp __P((char *));
extern int __swsetup __P((FILE *));
extern int __sflags __P((const char *, int *));
extern int __sdidinit;
extern int __sdidinit;
/*
* Return true iff the given FILE cannot be written now.