From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3940 invoked by alias); 5 Apr 2006 13:22:53 -0000 Received: (qmail 3924 invoked by uid 22791); 5 Apr 2006 13:22:52 -0000 X-Spam-Check-By: sourceware.org Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 05 Apr 2006 13:22:51 +0000 Received: from sunsite.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1]) by sunsite.mff.cuni.cz (8.13.1/8.13.1) with ESMTP id k35DMax5017849; Wed, 5 Apr 2006 15:22:36 +0200 Received: (from jj@localhost) by sunsite.mff.cuni.cz (8.13.1/8.13.1/Submit) id k35DMUJS017846; Wed, 5 Apr 2006 15:22:30 +0200 Date: Wed, 05 Apr 2006 13:22:00 -0000 From: Jakub Jelinek To: Ulrich Drepper , Alan Modra Cc: Glibc hackers Subject: Re: BZ #2450 fix breaks 64-bit builds Message-ID: <20060405132230.GH30252@sunsite.mff.cuni.cz> Reply-To: Jakub Jelinek References: <20060405060958.GQ9418@bubble.grove.modra.org> <20060405062039.GR9418@bubble.grove.modra.org> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20060405062039.GR9418@bubble.grove.modra.org> User-Agent: Mutt/1.4.1i Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2006-04/txt/msg00004.txt.bz2 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 > > > > * 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 Jakub Jelinek * 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