diff options
| author | Michael Hanson <mihanson@linhes.org> | 2012-02-20 21:32:43 (GMT) |
|---|---|---|
| committer | Michael Hanson <mihanson@linhes.org> | 2012-02-20 21:32:43 (GMT) |
| commit | 30c420f9bf1a561d360abb83ef9226583e7c5b58 (patch) | |
| tree | c861adc3fb699d8acb366b686cde52d28c40f759 /abs/extra/community/chromium/gcc-4.6.patch | |
| parent | e70a067f9eab0330e559b3d03c97cca3e02cd4ae (diff) | |
| parent | 21c364279485a642183b45c081c3936ba6230953 (diff) | |
| download | linhes_pkgbuild-30c420f9bf1a561d360abb83ef9226583e7c5b58.zip linhes_pkgbuild-30c420f9bf1a561d360abb83ef9226583e7c5b58.tar.gz linhes_pkgbuild-30c420f9bf1a561d360abb83ef9226583e7c5b58.tar.bz2 | |
Merge branch 'testing' of linhes.org:linhes_pkgbuild into testing
Diffstat (limited to 'abs/extra/community/chromium/gcc-4.6.patch')
| -rw-r--r-- | abs/extra/community/chromium/gcc-4.6.patch | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/abs/extra/community/chromium/gcc-4.6.patch b/abs/extra/community/chromium/gcc-4.6.patch index 220fe7a..b5e61dc 100644 --- a/abs/extra/community/chromium/gcc-4.6.patch +++ b/abs/extra/community/chromium/gcc-4.6.patch @@ -68,9 +68,9 @@ diff -u -r third_party/tcmalloc/chromium/src/common.cc third_party/tcmalloc/chro --- third_party/tcmalloc/chromium/src/common.cc 2011-04-13 13:23:04.000000000 +0400 +++ third_party/tcmalloc/chromium/src/common.cc 2011-04-20 19:32:58.000000000 +0400 @@ -34,6 +34,7 @@ - #include "system-alloc.h" #include "config.h" #include "common.h" + #include "system-alloc.h" +#include <cstddef> namespace tcmalloc { @@ -86,17 +86,6 @@ diff -u -r third_party/tcmalloc/chromium/src/symbolize.h third_party/tcmalloc/ch using std::map; -diff -u -r third_party/tcmalloc/chromium/src/system-alloc.h third_party/tcmalloc/chromium/src/system-alloc.h ---- third_party/tcmalloc/chromium/src/system-alloc.h 2011-04-13 13:23:04.000000000 +0400 -+++ third_party/tcmalloc/chromium/src/system-alloc.h 2011-04-20 19:32:58.000000000 +0400 -@@ -37,6 +37,7 @@ - #define TCMALLOC_SYSTEM_ALLOC_H_ - - #include <config.h> -+#include <cstddef> - #include "internal_logging.h" - - // REQUIRES: "alignment" is a power of two or "0" to indicate default alignment diff -u -r ui/gfx/codec/jpeg_codec.h ui/gfx/codec/jpeg_codec.h --- ui/gfx/codec/jpeg_codec.h 2011-04-13 13:23:45.000000000 +0400 +++ ui/gfx/codec/jpeg_codec.h 2011-04-20 19:32:58.000000000 +0400 |