1 diff -upr chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
2 --- chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-10 10:48:31.000000000 +0300
3 +++ chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-11 23:44:11.000000000 +0300
4 @@ -243,14 +243,13 @@ struct kernel_rusage {
5 long ru_nivcsw;
6 };
7
8 -struct siginfo;
9 #if defined(__i386__) || defined(__arm__) || defined(__PPC__)
10
11 /* include/asm-{arm,i386,mips,ppc}/signal.h */
12 struct kernel_old_sigaction {
13 union {
14 void (*sa_handler_)(int);
15 - void (*sa_sigaction_)(int, struct siginfo *, void *);
16 + void (*sa_sigaction_)(int, siginfo_t *, void *);
17 };
18 unsigned long sa_mask;
19 unsigned long sa_flags;
20 @@ -287,13 +286,13 @@ struct kernel_sigaction {
21 unsigned long sa_flags;
22 union {
23 void (*sa_handler_)(int);
24 - void (*sa_sigaction_)(int, struct siginfo *, void *);
25 + void (*sa_sigaction_)(int, siginfo_t *, void *);
26 };
27 struct kernel_sigset_t sa_mask;
28 #else
29 union {
30 void (*sa_handler_)(int);
31 - void (*sa_sigaction_)(int, struct siginfo *, void *);
32 + void (*sa_sigaction_)(int, siginfo_t *, void *);
33 };
34 unsigned long sa_flags;
35 void (*sa_restorer)(void);
|
