[dpkg] 183/200: libcompat: Do not redeclare sys_siglist when the system does so

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository dpkg.

commit edeb1593a9e7e2a5a38f2b28841d831bfee4ee7d
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Sat Feb 11 19:55:16 2017 +0100

    libcompat: Do not redeclare sys_siglist when the system does so
    
    This can cause issues if the declaration is not exactly the same, and
    declaring it when the system already does is bogus no matter what.
    
    Signed-off-by: Guillem Jover <guillem at debian.org>
---
 debian/changelog       | 3 +++
 lib/compat/strsignal.c | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3c98ade..2c8a2f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ dpkg (1.18.23) UNRELEASED; urgency=medium
   * Handle unmatched arch-qualified virtual packages in dpkg-genbuildinfo,
     instead of letting perl die. Closes: #849944
   * Declare .buildinfo format as stable with version 1.0.
+  * Portability:
+    - Do not redeclare sys_siglist in libcompat when the system does so.
+      Thanks to Thomas Klausner <wiz at NetBSD.org>.
   * Perl modules:
     - Do not special case EM_SPARC32PLUS for NetBSD in Dpkg::Shlibs::Objdump,
       the code has been fixed in NetBSD as that situation could not happen.
diff --git a/lib/compat/strsignal.c b/lib/compat/strsignal.c
index ad2bb3a..66ed0c3 100644
--- a/lib/compat/strsignal.c
+++ b/lib/compat/strsignal.c
@@ -60,7 +60,6 @@ const char *const sys_siglist[] = {
 #  define NSIG 32
 # endif
 # define COMPAT_NSIGLIST NSIG
-extern const char *const sys_siglist[];
 #endif
 
 const char *

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git