3 changed files with 1 additions and 46 deletions
@ -1,44 +0,0 @@ |
|||||
From d45f27147f7d95eb209463dc03dc039ea3f15b59 Mon Sep 17 00:00:00 2001 |
|
||||
Message-Id: <d45f27147f7d95eb209463dc03dc039ea3f15b59.1509109458.git.thomas.harfmann@gmail.com> |
|
||||
From: Baruch Siach <baruch@tkos.co.il> |
|
||||
Date: Fri, 8 Sep 2017 12:12:57 +0300 |
|
||||
Subject: [PATCH] error_prints: fix potential program_invocation_name type |
|
||||
conflict |
|
||||
MIME-Version: 1.0 |
|
||||
Content-Type: text/plain; charset=UTF-8 |
|
||||
Content-Transfer-Encoding: 8bit |
|
||||
|
|
||||
uClibc-ng declares program_invocation_name as const. |
|
||||
This causes the build failure below: |
|
||||
|
|
||||
error_prints.c:40:14: error: conflicting types for ‘program_invocation_name’ |
|
||||
extern char *program_invocation_name; |
|
||||
^~~~~~~~~~~~~~~~~~~~~~~ |
|
||||
In file included from error_prints.c:32:0: |
|
||||
.../output/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/errno.h:54:20: note: previous declaration of ‘program_invocation_name’ was here |
|
||||
extern const char *program_invocation_name, *program_invocation_short_name; |
|
||||
^~~~~~~~~~~~~~~~~~~~~~~ |
|
||||
|
|
||||
* error_prints.c (program_invocation_name): Declare only in case |
|
||||
of [!HAVE_PROGRAM_INVOCATION_NAME]. |
|
||||
---
|
|
||||
error_prints.c | 2 ++ |
|
||||
1 file changed, 2 insertions(+) |
|
||||
|
|
||||
diff --git a/error_prints.c b/error_prints.c
|
|
||||
index 8519b924..710e99b0 100644
|
|
||||
--- a/error_prints.c
|
|
||||
+++ b/error_prints.c
|
|
||||
@@ -37,7 +37,9 @@
|
|
||||
|
|
||||
#include "error_prints.h" |
|
||||
|
|
||||
+#ifndef HAVE_PROGRAM_INVOCATION_NAME
|
|
||||
extern char *program_invocation_name; |
|
||||
+#endif
|
|
||||
|
|
||||
static void |
|
||||
verror_msg(int err_no, const char *fmt, va_list p) |
|
||||
--
|
|
||||
2.15.0.rc2 |
|
||||
|
|
Loading…
Reference in new issue