diff options
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/fileops.c | 11 | ||||
| -rw-r--r-- | libio/genops.c | 8 | ||||
| -rw-r--r-- | libio/iopopen.c | 5 | ||||
| -rw-r--r-- | libio/libioP.h | 5 |
4 files changed, 10 insertions, 19 deletions
diff --git a/libio/fileops.c b/libio/fileops.c index c914e84ce0..5340603476 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995, 1997-2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995, 1997-2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Per Bothner <bothner@cygnus.com>. @@ -1185,12 +1185,9 @@ _IO_file_seekoff_mmap (fp, offset, dir, mode) return offset; } -_IO_off64_t -_IO_file_seekoff_maybe_mmap (fp, offset, dir, mode) - _IO_FILE *fp; - _IO_off64_t offset; - int dir; - int mode; +static _IO_off64_t +_IO_file_seekoff_maybe_mmap (_IO_FILE *fp, _IO_off64_t offset, int dir, + int mode) { /* We only get here when we haven't tried to read anything yet. So there is nothing more useful for us to do here than just diff --git a/libio/genops.c b/libio/genops.c index 74558807e7..c88a26f5f9 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,1995,1997-2001,2002 Free Software Foundation, Inc. +/* Copyright (C) 1993,1995,1997-2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -1264,10 +1264,6 @@ __io_defs io_defs__; #endif /* TODO */ -#ifdef weak_alias -weak_alias (_IO_cleanup, _cleanup) -#endif - #ifdef text_set_element -text_set_element(__libc_atexit, _cleanup); +text_set_element(__libc_atexit, _IO_cleanup); #endif diff --git a/libio/iopopen.c b/libio/iopopen.c index d6a6f6aa47..80a97f1b64 100644 --- a/libio/iopopen.c +++ b/libio/iopopen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,1997-2001,2002 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997-2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Per Bothner <bothner@cygnus.com>. @@ -104,6 +104,7 @@ struct _IO_proc_file }; typedef struct _IO_proc_file _IO_proc_file; +static struct _IO_jump_t _IO_proc_jumps; static struct _IO_jump_t _IO_wproc_jumps; static struct _IO_proc_file *proc_file_chain; @@ -284,7 +285,7 @@ _IO_new_proc_close (fp) #endif } -struct _IO_jump_t _IO_proc_jumps = { +static struct _IO_jump_t _IO_proc_jumps = { JUMP_INIT_DUMMY, JUMP_INIT(finish, _IO_new_file_finish), JUMP_INIT(overflow, _IO_new_file_overflow), diff --git a/libio/libioP.h b/libio/libioP.h index 760bb1e702..d55bd73902 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997-2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997-2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -457,7 +457,6 @@ extern struct _IO_jump_t _IO_wfile_jumps_mmap attribute_hidden; extern struct _IO_jump_t _IO_wfile_jumps_maybe_mmap attribute_hidden; extern struct _IO_jump_t _IO_old_file_jumps attribute_hidden; extern struct _IO_jump_t _IO_streambuf_jumps; -extern struct _IO_jump_t _IO_proc_jumps attribute_hidden; extern struct _IO_jump_t _IO_old_proc_jumps attribute_hidden; extern struct _IO_jump_t _IO_str_jumps attribute_hidden; extern struct _IO_jump_t _IO_wstr_jumps attribute_hidden; @@ -526,8 +525,6 @@ extern _IO_FILE* _IO_file_setbuf __P ((_IO_FILE *, char *, _IO_ssize_t)); extern _IO_off64_t _IO_file_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int)); extern _IO_off64_t _IO_file_seekoff_mmap __P ((_IO_FILE *, _IO_off64_t, int, int)); -extern _IO_off64_t _IO_file_seekoff_maybe_mmap __P ((_IO_FILE *, _IO_off64_t, - int, int)); extern _IO_size_t _IO_file_xsputn __P ((_IO_FILE *, const void *, _IO_size_t)); extern _IO_size_t _IO_file_xsgetn __P ((_IO_FILE *, void *, _IO_size_t)); extern int _IO_file_stat __P ((_IO_FILE *, void *)); |