From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C45B41384B4 for ; Sun, 20 Dec 2015 21:12:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DFBF21C004; Sun, 20 Dec 2015 21:12:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D34D621C004 for ; Sun, 20 Dec 2015 21:12:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC9C533E3A9 for ; Sun, 20 Dec 2015 21:12:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 26980CAF for ; Sun, 20 Dec 2015 21:12:20 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1450645696.7a923f646ce10b7dec3c7ae5fe2079c10aa21752.vapier@gentoo> Subject: [gentoo-commits] proj/sandbox:master commit in: libsbutil/gnulib/ X-VCS-Repository: proj/sandbox X-VCS-Files: libsbutil/gnulib/hash-triple.c libsbutil/gnulib/same.h X-VCS-Directories: libsbutil/gnulib/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 7a923f646ce10b7dec3c7ae5fe2079c10aa21752 X-VCS-Branch: master Date: Sun, 20 Dec 2015 21:12:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d0f1de2d-16fb-4f12-9ac8-2c90ea98fbcb X-Archives-Hash: 76ae2f46912d62f1e8acecffb2198822 commit: 7a923f646ce10b7dec3c7ae5fe2079c10aa21752 Author: Mike Frysinger gentoo org> AuthorDate: Sun Dec 20 21:08:16 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sun Dec 20 21:08:16 2015 +0000 URL: https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=7a923f64 libsbutil: gnulib: hand disable same_name usage We don't provide same_name because the one caller we don't use, but it relies on gc-sections to avoid link errors. That flag doesn't work on ia64 though, so we need to hand delete the one caller. Ugh. Signed-off-by: Mike Frysinger gentoo.org> libsbutil/gnulib/hash-triple.c | 9 --------- libsbutil/gnulib/same.h | 25 ------------------------- 2 files changed, 34 deletions(-) diff --git a/libsbutil/gnulib/hash-triple.c b/libsbutil/gnulib/hash-triple.c index c3b6d9f..06cfbdf 100644 --- a/libsbutil/gnulib/hash-triple.c +++ b/libsbutil/gnulib/hash-triple.c @@ -24,7 +24,6 @@ #include #include "hash-pjw.h" -#include "same.h" #include "same-inode.h" #define STREQ(a, b) (strcmp (a, b) == 0) @@ -52,14 +51,6 @@ triple_hash_no_name (void const *x, size_t table_size) /* Compare two F_triple structs. */ bool -triple_compare (void const *x, void const *y) -{ - struct F_triple const *a = x; - struct F_triple const *b = y; - return (SAME_INODE (*a, *b) && same_name (a->name, b->name)) ? true : false; -} - -bool triple_compare_ino_str (void const *x, void const *y) { struct F_triple const *a = x; diff --git a/libsbutil/gnulib/same.h b/libsbutil/gnulib/same.h deleted file mode 100644 index ee313c5..0000000 --- a/libsbutil/gnulib/same.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Determine whether two file names refer to the same file. - - Copyright (C) 1997-2000, 2003-2004, 2009-2015 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -#ifndef SAME_H_ -# define SAME_H_ 1 - -# include - -bool same_name (const char *source, const char *dest); - -#endif /* SAME_H_ */