]> granicus.if.org Git - strace/commitdiff
error_prints: fix potential program_invocation_name type conflict
authorBaruch Siach <baruch@tkos.co.il>
Fri, 8 Sep 2017 09:12:57 +0000 (12:12 +0300)
committerDmitry V. Levin <ldv@altlinux.org>
Fri, 8 Sep 2017 10:42:52 +0000 (10:42 +0000)
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

index 8519b924669801ec481ec31de1f81aa06336a845..710e99b04ab98a70a9c6521aa05ca13946af9053 100644 (file)
@@ -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)