summaryrefslogtreecommitdiff
path: root/packages/strace/4.19/0000-conflicting-decl.patch
blob: 92427e199b439d7d4b7ee49a2cb8d125121bf08a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
commit d45f27147f7d95eb209463dc03dc039ea3f15b59
Author: Baruch Siach <baruch@tkos.co.il>
Date:   Fri Sep 8 12:12:57 2017 +0300

    error_prints: fix potential program_invocation_name type conflict
    
    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(+)

--- 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)