diff options
| author | Roland McGrath <roland@gnu.org> | 2003-04-16 03:12:34 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2003-04-16 03:12:34 +0000 |
| commit | 4ab6f47ce341913208e424eb70364442e826a00a (patch) | |
| tree | ef7f100312a2fea583d0bf4e03ea1aa6df2c3b02 | |
| parent | 21e66107561c463d5ce502d6b2bfce231898bd95 (diff) | |
| download | glibc-4ab6f47ce341913208e424eb70364442e826a00a.tar.gz glibc-4ab6f47ce341913208e424eb70364442e826a00a.tar.xz glibc-4ab6f47ce341913208e424eb70364442e826a00a.zip | |
* libio/fileops.c (_IO_file_close_it): Macro tweak to avoid warning.
* sysdeps/generic/libc-start.c [NEED_DL_SYSINFO]: Add decl for INTUSE(__register_frame_info_bases).
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libio/fileops.c | 2 | ||||
| -rw-r--r-- | nptl/ChangeLog | 4 | ||||
| -rw-r--r-- | nptl/forward.c | 2 |
4 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index dce7bae569..009a9d65df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-04-15 Roland McGrath <roland@redhat.com> + + * libio/fileops.c (_IO_file_close_it): Macro tweak to avoid warning. + + * sysdeps/generic/libc-start.c [NEED_DL_SYSINFO]: Add decl for + INTUSE(__register_frame_info_bases). + 2003-04-15 Ulrich Drepper <drepper@redhat.com> * elf/elf.h: Define AT_SYSINFO_EH_FRAME. diff --git a/libio/fileops.c b/libio/fileops.c index fe8093e7b2..33f48fa4a3 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -63,6 +63,7 @@ extern int errno; # define read(FD, Buf, NBytes) __read (FD, Buf, NBytes) # define write(FD, Buf, NBytes) __write (FD, Buf, NBytes) # define _IO_do_write _IO_new_do_write /* For macro uses. */ +# define _IO_file_close_it _IO_new_file_close_it #else # define _IO_new_do_write _IO_do_write # define _IO_new_file_attach _IO_file_attach @@ -1545,6 +1546,7 @@ _IO_file_xsgetn_maybe_mmap (fp, data, n) #ifdef _LIBC # undef _IO_do_write +# undef _IO_file_close_it versioned_symbol (libc, _IO_new_do_write, _IO_do_write, GLIBC_2_1); versioned_symbol (libc, _IO_new_file_attach, _IO_file_attach, GLIBC_2_1); versioned_symbol (libc, _IO_new_file_close_it, _IO_file_close_it, GLIBC_2_1); diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 394e224e1e..c7cfbbb076 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2003-04-15 Roland McGrath <roland@redhat.com> + + * forward.c (__pthread_unwind): Tweak to avoid warning. + 2003-04-15 Ulrich Drepper <drepper@redhat.com> * pthreadP.h: Move THREAD_ATOMIC_* replacements to the top. diff --git a/nptl/forward.c b/nptl/forward.c index ed3e23e68d..1f4cd482c6 100644 --- a/nptl/forward.c +++ b/nptl/forward.c @@ -173,6 +173,7 @@ FORWARD (pthread_setcancelstate, (int state, int *oldstate), (state, oldstate), FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0) +#define return /* value is void */ FORWARD2(__pthread_unwind, void attribute_hidden __attribute ((noreturn)) __cleanup_fct_attribute, (__pthread_unwind_buf_t *buf), (buf), { @@ -180,3 +181,4 @@ FORWARD2(__pthread_unwind, INTERNAL_SYSCALL_DECL (err); INTERNAL_SYSCALL (kill, err, 1, SIGKILL); }) +#undef return |