diff options
| author | vapier@chromium.org <vapier@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-03 07:37:13 +0000 |
|---|---|---|
| committer | vapier@chromium.org <vapier@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-03 07:37:13 +0000 |
| commit | f274776714f6e1ad85b06f7979cab7bd603078ff (patch) | |
| tree | ca0942e42a5a1230e2319b5a64ddca6024af93c3 /third_party/tcmalloc | |
| parent | 5351cc4b92a85cd508cf6944386141945a913f5e (diff) | |
| download | chromium_src-f274776714f6e1ad85b06f7979cab7bd603078ff.zip chromium_src-f274776714f6e1ad85b06f7979cab7bd603078ff.tar.gz chromium_src-f274776714f6e1ad85b06f7979cab7bd603078ff.tar.bz2 | |
fix building w/glibc-2.16+: use siginfo_t everywhere
This pulls in the fix already in upstream:
https://code.google.com/p/gperftools/source/detail?r=176
BUG=chromium-os:36866
Review URL: https://chromiumcodereview.appspot.com/12390048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc')
| -rw-r--r-- | third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 7 | ||||
| -rw-r--r-- | third_party/tcmalloc/vendor/src/base/linux_syscall_support.h | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h index 99dac9e..d550776 100644 --- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h @@ -243,14 +243,13 @@ struct kernel_rusage { long ru_nivcsw; }; -struct siginfo; #if defined(__i386__) || defined(__arm__) || defined(__PPC__) /* include/asm-{arm,i386,mips,ppc}/signal.h */ struct kernel_old_sigaction { union { void (*sa_handler_)(int); - void (*sa_sigaction_)(int, struct siginfo *, void *); + void (*sa_sigaction_)(int, siginfo_t *, void *); }; unsigned long sa_mask; unsigned long sa_flags; @@ -287,13 +286,13 @@ struct kernel_sigaction { unsigned long sa_flags; union { void (*sa_handler_)(int); - void (*sa_sigaction_)(int, struct siginfo *, void *); + void (*sa_sigaction_)(int, siginfo_t *, void *); }; struct kernel_sigset_t sa_mask; #else union { void (*sa_handler_)(int); - void (*sa_sigaction_)(int, struct siginfo *, void *); + void (*sa_sigaction_)(int, siginfo_t *, void *); }; unsigned long sa_flags; void (*sa_restorer)(void); diff --git a/third_party/tcmalloc/vendor/src/base/linux_syscall_support.h b/third_party/tcmalloc/vendor/src/base/linux_syscall_support.h index 99dac9e..d550776 100644 --- a/third_party/tcmalloc/vendor/src/base/linux_syscall_support.h +++ b/third_party/tcmalloc/vendor/src/base/linux_syscall_support.h @@ -243,14 +243,13 @@ struct kernel_rusage { long ru_nivcsw; }; -struct siginfo; #if defined(__i386__) || defined(__arm__) || defined(__PPC__) /* include/asm-{arm,i386,mips,ppc}/signal.h */ struct kernel_old_sigaction { union { void (*sa_handler_)(int); - void (*sa_sigaction_)(int, struct siginfo *, void *); + void (*sa_sigaction_)(int, siginfo_t *, void *); }; unsigned long sa_mask; unsigned long sa_flags; @@ -287,13 +286,13 @@ struct kernel_sigaction { unsigned long sa_flags; union { void (*sa_handler_)(int); - void (*sa_sigaction_)(int, struct siginfo *, void *); + void (*sa_sigaction_)(int, siginfo_t *, void *); }; struct kernel_sigset_t sa_mask; #else union { void (*sa_handler_)(int); - void (*sa_sigaction_)(int, struct siginfo *, void *); + void (*sa_sigaction_)(int, siginfo_t *, void *); }; unsigned long sa_flags; void (*sa_restorer)(void); |