From 56b9efc0f3f0ebf8a9c7f70d3c9c3fb47f86c1d6 Mon Sep 17 00:00:00 2001 From: stefanf Date: Mon, 12 Sep 2005 13:46:32 +0000 Subject: Move the declaration of __cleanup to libc_private.h as it is used in both stdio/ and stdlib/. Don't define __cleanup twice. --- lib/libc/stdio/local.h | 1 - lib/libc/stdio/makebuf.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/libc/stdio') diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h index 16a9e78..74c3238 100644 --- a/lib/libc/stdio/local.h +++ b/lib/libc/stdio/local.h @@ -65,7 +65,6 @@ extern fpos_t __sseek(void *, fpos_t, int); extern int __sclose(void *); extern void __sinit(void); extern void _cleanup(void); -extern void (*__cleanup)(void); extern void __smakebuf(FILE *); extern int __swhatbuf(FILE *, size_t *, int *); extern int _fwalk(int (*)(FILE *)); diff --git a/lib/libc/stdio/makebuf.c b/lib/libc/stdio/makebuf.c index bc8a468..bdade67 100644 --- a/lib/libc/stdio/makebuf.c +++ b/lib/libc/stdio/makebuf.c @@ -46,9 +46,11 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include "local.h" #include "un-namespace.h" +#include "libc_private.h" +#include "local.h" + /* * Allocate a file buffer, or switch to unbuffered I/O. * Per the ANSI C standard, ALL tty devices default to line buffered. -- cgit v1.1