aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog8
-rw-r--r--include/libiberty.h5
2 files changed, 8 insertions, 5 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 55214a1..7108265 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,11 @@
+2022-01-13 Nick Clifton <nickc@redhat.com>
+
+ Import from gcc mainline:
+
+ 2021-01-03 Mike Frysinger <vapier@gentoo.org>
+
+ * libiberty.h (strverscmp): Delete duplicate prototype.
+
2021-12-07 John Baldwin <jhb@FreeBSD.org>
* elf/common.h (AT_FREEBSD_FXRNG, AT_FREEBSD_KPRELOAD): Define.
diff --git a/include/libiberty.h b/include/libiberty.h
index 69f2e05..a65ced9 100644
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -713,11 +713,6 @@ extern unsigned long long int strtoull (const char *nptr,
char **endptr, int base);
#endif
-#if defined(HAVE_DECL_STRVERSCMP) && !HAVE_DECL_STRVERSCMP
-/* Compare version strings. */
-extern int strverscmp (const char *, const char *);
-#endif
-
/* Set the title of a process */
extern void setproctitle (const char *name, ...);