[gentoo-commits] proj/sandbox:master commit in: libsbutil/gnulib/

[Mike Frysinger]

commit: 7a923f646ce10b7dec3c7ae5fe2079c10aa21752
Author: Mike Frysinger  gentoo  org>
AuthorDate: Sun Dec 20 21:08:16 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Sun Dec 20 21:08:16 2015 +
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..000
--- 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_ */

[gentoo-commits] proj/sandbox:master commit in: libsbutil/gnulib/

[Mike Frysinger]

commit: e2f06703fe28a3dcc70b847d3b7723bf5c346763
Author: Mike Frysinger  gentoo  org>
AuthorDate: Sat Sep 26 23:42:05 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Sat Sep 26 23:42:05 2015 +
URL:https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=e2f06703

libsbutil: gnulib: mark xgetcwd static inline

Rather than use gnu inline where gcc can create external references
(which we don't provide), just always inline the xgetcwd func.  This
fixes building at -O0 optimization levels.

URL: https://bugs.gentoo.org/561342
Reported-by: Pryka  gmail.com>
Signed-off-by: Mike Frysinger  gentoo.org>

 libsbutil/gnulib/xgetcwd.h | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/libsbutil/gnulib/xgetcwd.h b/libsbutil/gnulib/xgetcwd.h
index 765fab4..fbe0a7c 100644
--- a/libsbutil/gnulib/xgetcwd.h
+++ b/libsbutil/gnulib/xgetcwd.h
@@ -6,16 +6,12 @@
  * Licensed under the GPL-2
  */
 
-_GL_INLINE_HEADER_BEGIN
-
 extern char *egetcwd(char *buf, size_t size);
 
-_GL_INLINE char *xgetcwd(void)
+static inline char *xgetcwd(void)
 {
char *ret = egetcwd(NULL, 0);
if (ret == NULL && errno == ENOMEM)
xalloc_die();
return ret;
 }
-
-_GL_INLINE_HEADER_END