From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>, Alan Modra <amodra@bigpond.net.au>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: Re: BZ #2450 fix breaks 64-bit builds
Date: Wed, 05 Apr 2006 13:22:00 -0000 [thread overview]
Message-ID: <20060405132230.GH30252@sunsite.mff.cuni.cz> (raw)
In-Reply-To: <20060405062039.GR9418@bubble.grove.modra.org>
On Wed, Apr 05, 2006 at 03:50:39PM +0930, Alan Modra wrote:
> On Wed, Apr 05, 2006 at 03:39:58PM +0930, Alan Modra wrote:
> > ../posix/bits/unistd.h:95: error: conflicting types for âreadlinkâ
> > ../posix/unistd.h:775: error: previous declaration of âreadlinkâ was here
> >
> >
> > 2006-04-05 Alan Modra <amodra@bigpond.net.au>
> >
> > * posix/bits/unistd.h (readlink): Update.
>
> Oops. Hit send too quickly. Obviously, __readlink_chk and
> __readlink_alias need updating too.
Yeah, here is what I have tested. debug/readlink_chk.c surprisingly
was already using ssize_t return type.
2006-04-05 Alan Modra <amodra@bigpond.net.au>
Jakub Jelinek <jakub@redhat.com>
* posix/bits/unistd.h (readlink, __readlink_chk, __readlink_alias):
Change return value to ssize_t.
--- libc/posix/bits/unistd.h.jj 2005-08-17 18:03:25.000000000 +0200
+++ libc/posix/bits/unistd.h 2006-04-05 13:09:36.000000000 +0200
@@ -1,5 +1,5 @@
/* Checking macros for unistd functions.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 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
@@ -80,16 +80,16 @@ pread64 (int __fd, void *__buf, size_t _
#endif
#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
-extern int __readlink_chk (__const char *__restrict __path,
- char *__restrict __buf, size_t __len,
- size_t __buflen)
+extern ssize_t __readlink_chk (__const char *__restrict __path,
+ char *__restrict __buf, size_t __len,
+ size_t __buflen)
__THROW __nonnull ((1, 2)) __wur;
-extern int __REDIRECT_NTH (__readlink_alias,
- (__const char *__restrict __path,
- char *__restrict __buf, size_t __len), readlink)
+extern ssize_t __REDIRECT_NTH (__readlink_alias,
+ (__const char *__restrict __path,
+ char *__restrict __buf, size_t __len), readlink)
__nonnull ((1, 2)) __wur;
-extern __always_inline __nonnull ((1, 2)) __wur int
+extern __always_inline __nonnull ((1, 2)) __wur ssize_t
__NTH (readlink (__const char *__restrict __path, char *__restrict __buf,
size_t __len))
{
Jakub
parent reply other threads:[~2006-04-05 13:22 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <20060405062039.GR9418@bubble.grove.modra.org>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060405132230.GH30252@sunsite.mff.cuni.cz \
--to=jakub@redhat.com \
--cc=amodra@bigpond.net.au \
--cc=drepper@redhat.com \
--cc=libc-hacker@sources.redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).