1 |
commit: 7a923f646ce10b7dec3c7ae5fe2079c10aa21752 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 20 21:08:16 2015 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 20 21:08:16 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=7a923f64 |
7 |
|
8 |
libsbutil: gnulib: hand disable same_name usage |
9 |
|
10 |
We don't provide same_name because the one caller we don't use, but it |
11 |
relies on gc-sections to avoid link errors. That flag doesn't work on |
12 |
ia64 though, so we need to hand delete the one caller. Ugh. |
13 |
|
14 |
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> |
15 |
|
16 |
libsbutil/gnulib/hash-triple.c | 9 --------- |
17 |
libsbutil/gnulib/same.h | 25 ------------------------- |
18 |
2 files changed, 34 deletions(-) |
19 |
|
20 |
diff --git a/libsbutil/gnulib/hash-triple.c b/libsbutil/gnulib/hash-triple.c |
21 |
index c3b6d9f..06cfbdf 100644 |
22 |
--- a/libsbutil/gnulib/hash-triple.c |
23 |
+++ b/libsbutil/gnulib/hash-triple.c |
24 |
@@ -24,7 +24,6 @@ |
25 |
#include <string.h> |
26 |
|
27 |
#include "hash-pjw.h" |
28 |
-#include "same.h" |
29 |
#include "same-inode.h" |
30 |
|
31 |
#define STREQ(a, b) (strcmp (a, b) == 0) |
32 |
@@ -52,14 +51,6 @@ triple_hash_no_name (void const *x, size_t table_size) |
33 |
|
34 |
/* Compare two F_triple structs. */ |
35 |
bool |
36 |
-triple_compare (void const *x, void const *y) |
37 |
-{ |
38 |
- struct F_triple const *a = x; |
39 |
- struct F_triple const *b = y; |
40 |
- return (SAME_INODE (*a, *b) && same_name (a->name, b->name)) ? true : false; |
41 |
-} |
42 |
- |
43 |
-bool |
44 |
triple_compare_ino_str (void const *x, void const *y) |
45 |
{ |
46 |
struct F_triple const *a = x; |
47 |
|
48 |
diff --git a/libsbutil/gnulib/same.h b/libsbutil/gnulib/same.h |
49 |
deleted file mode 100644 |
50 |
index ee313c5..0000000 |
51 |
--- a/libsbutil/gnulib/same.h |
52 |
+++ /dev/null |
53 |
@@ -1,25 +0,0 @@ |
54 |
-/* Determine whether two file names refer to the same file. |
55 |
- |
56 |
- Copyright (C) 1997-2000, 2003-2004, 2009-2015 Free Software Foundation, Inc. |
57 |
- |
58 |
- This program is free software: you can redistribute it and/or modify |
59 |
- it under the terms of the GNU General Public License as published by |
60 |
- the Free Software Foundation; either version 3 of the License, or |
61 |
- (at your option) any later version. |
62 |
- |
63 |
- This program is distributed in the hope that it will be useful, |
64 |
- but WITHOUT ANY WARRANTY; without even the implied warranty of |
65 |
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
66 |
- GNU General Public License for more details. |
67 |
- |
68 |
- You should have received a copy of the GNU General Public License |
69 |
- along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
70 |
- |
71 |
-#ifndef SAME_H_ |
72 |
-# define SAME_H_ 1 |
73 |
- |
74 |
-# include <stdbool.h> |
75 |
- |
76 |
-bool same_name (const char *source, const char *dest); |
77 |
- |
78 |
-#endif /* SAME_H_ */ |