1*4882a593SmuzhiyunFrom 99617d7ab5b01c322b0f27d4aa0dd91c61793a5e Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com> 3*4882a593SmuzhiyunDate: Wed, 10 Nov 2021 21:17:48 -0300 4*4882a593SmuzhiyunSubject: [PATCH] debuginfod: fix compilation on platforms without <error.h> 5*4882a593SmuzhiyunMIME-Version: 1.0 6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun"system.h" only declares the error() function, so it needs to be in an 10*4882a593Smuzhiyun'extern "C"' block, otherwise linking fails. 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunSince we are here, use quotes for "system.h" header, since it's a local 13*4882a593Smuzhiyunheader, not a system one. 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunUpstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commit;h=90b9e91b961b794a4e58ab76d9191a5e7343584e] 16*4882a593SmuzhiyunSigned-off-by: Érico Nogueira <erico.erc@gmail.com> 17*4882a593SmuzhiyunSigned-off-by: Alexander Kanavin <alex@linutronix.de> 18*4882a593Smuzhiyun--- 19*4882a593Smuzhiyun debuginfod/ChangeLog | 4 ++++ 20*4882a593Smuzhiyun debuginfod/debuginfod.cxx | 2 +- 21*4882a593Smuzhiyun 2 files changed, 5 insertions(+), 1 deletion(-) 22*4882a593Smuzhiyun 23*4882a593Smuzhiyundiff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog 24*4882a593Smuzhiyunindex f06d3ee..822bd63 100644 25*4882a593Smuzhiyun--- a/debuginfod/ChangeLog 26*4882a593Smuzhiyun+++ b/debuginfod/ChangeLog 27*4882a593Smuzhiyun@@ -1,3 +1,7 @@ 28*4882a593Smuzhiyun+2021-11-10 Érico N. Rolim <erico.erc@gmail.com> 29*4882a593Smuzhiyun+ 30*4882a593Smuzhiyun+ * debuginfod.cxx: include "system.h" under 'extern "C"' block. 31*4882a593Smuzhiyun+ 32*4882a593Smuzhiyun 2021-11-05 Frank Ch. Eigler <fche@redhat.com> 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun PR28430 35*4882a593Smuzhiyundiff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx 36*4882a593Smuzhiyunindex 521cb52..764e7b9 100644 37*4882a593Smuzhiyun--- a/debuginfod/debuginfod.cxx 38*4882a593Smuzhiyun+++ b/debuginfod/debuginfod.cxx 39*4882a593Smuzhiyun@@ -33,11 +33,11 @@ 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun extern "C" { 42*4882a593Smuzhiyun #include "printversion.h" 43*4882a593Smuzhiyun+#include "system.h" 44*4882a593Smuzhiyun } 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun #include "debuginfod.h" 47*4882a593Smuzhiyun #include <dwarf.h> 48*4882a593Smuzhiyun-#include <system.h> 49*4882a593Smuzhiyun 50*4882a593Smuzhiyun #include <argp.h> 51*4882a593Smuzhiyun #ifdef __GNUC__ 52*4882a593Smuzhiyun-- 53*4882a593Smuzhiyun2.20.1 54*4882a593Smuzhiyun 55