patches/gcc/4.2.2/180-c99-snprintf.patch
author Daniel Zimmermann <netzimme@gmail.com>
Mon Nov 25 08:56:55 2013 +0100 (2013-11-25)
changeset 3255 4f3536b12be5
parent 431 8bde4c6ea47a
permissions -rw-r--r--
debug/strace: pump version to 4.7 and 4.8

Pump version for strace to 4.7 and 4.8.
Add patch from strace mainline.


Work around conflict between <sys/ptrace.h> and <linux/ptrace.h>

Since glibc-2.18~39 <sys/ptrace.h> defines ptrace_peeksiginfo_args
which collides with <linux/ptrace.h>.

* configure.ac: Check for `struct ptrace_peeksiginfo_args' in
<sys/ptrace.h>.
* process.c: Work around potential conflict between <sys/ptrace.h>
and <linux/ptrace.h> by redefining ptrace_peeksiginfo_args.
* signal.c: Likewise.
* syscall.c: Likewise.
* util.c: Likewise.
http://sourceforge.net/p/strace/code/ci/0b4060f61f1bb101b5d8d084714b7d2feacdb199/

Signed-off-by: "Daniel Zimmermann" <netzimme@gmail.com>
Message-Id: <67b082cf1cdc8276eb4a.1385366288@haus-VirtualBox>
Patchwork-Id: 293842
yann@313
     1
diff -durN gcc-4.2.1.orig/libstdc++-v3/include/c_std/std_cstdio.h gcc-4.2.1/libstdc++-v3/include/c_std/std_cstdio.h
yann@313
     2
--- gcc-4.2.1.orig/libstdc++-v3/include/c_std/std_cstdio.h	2006-12-07 10:33:51.000000000 +0100
yann@313
     3
+++ gcc-4.2.1/libstdc++-v3/include/c_std/std_cstdio.h	2007-08-03 20:33:24.000000000 +0200
yann@313
     4
@@ -144,7 +144,7 @@
yann@313
     5
 
yann@313
     6
 _GLIBCXX_END_NAMESPACE
yann@313
     7
 
yann@313
     8
-#if _GLIBCXX_USE_C99
yann@313
     9
+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__)
yann@313
    10
 
yann@313
    11
 #undef snprintf
yann@313
    12
 #undef vfscanf