diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-17 13:57:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-19 13:44:40 +0000 |
| commit | 6ec7b8da05d21a3878bd21c691b41e675d74bb1c (patch) | |
| tree | b87f250bc19413750b9bb9cdbf2da20ef5014820 /chromium/third_party/flac | |
| parent | ec02ee4181c49b61fce1c8fb99292dbb8139cc90 (diff) | |
| download | qtwebengine-chromium-6ec7b8da05d21a3878bd21c691b41e675d74bb1c.tar.gz | |
BASELINE: Update Chromium to 60.0.3112.70
Change-Id: I9911c2280a014d4632f254857876a395d4baed2d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party/flac')
| -rw-r--r-- | chromium/third_party/flac/OWNERS | 2 | ||||
| -rw-r--r-- | chromium/third_party/flac/README.chromium | 2 | ||||
| -rw-r--r-- | chromium/third_party/flac/include/share/compat.h | 4 | ||||
| -rw-r--r-- | chromium/third_party/flac/src/libFLAC/md5.c | 1 | ||||
| -rw-r--r-- | chromium/third_party/flac/src/libFLAC/memory.c | 1 |
5 files changed, 9 insertions, 1 deletions
diff --git a/chromium/third_party/flac/OWNERS b/chromium/third_party/flac/OWNERS index 3059928dc62..e26405ceae8 100644 --- a/chromium/third_party/flac/OWNERS +++ b/chromium/third_party/flac/OWNERS @@ -1,2 +1,2 @@ -philipj@opera.com +foolip@chromium.org tommi@chromium.org diff --git a/chromium/third_party/flac/README.chromium b/chromium/third_party/flac/README.chromium index 70139bc14c1..9e2ee71977a 100644 --- a/chromium/third_party/flac/README.chromium +++ b/chromium/third_party/flac/README.chromium @@ -23,3 +23,5 @@ of flac-1.3.1 with all the unused files removed and the following changes: https://git.xiph.org/?p=flac.git;a=commit;h=28817ba52fdd92b0a49f84b2e8848199efc00242 - src/libFLAC/lpc.c: Restore missing conditional. Upstream: https://git.xiph.org/?p=flac.git;a=commit;h=ef9f7998fd358b2812a7296fe1c5aed221bade5f +- Include limits.h on Android to work around NDK deficiency. Upstream: + https://git.xiph.org/?p=flac.git;a=commit;h=b762a20ace7c7771f87f63478bcee3cf51268cff diff --git a/chromium/third_party/flac/include/share/compat.h b/chromium/third_party/flac/include/share/compat.h index 0dc5673d71a..b158e06071a 100644 --- a/chromium/third_party/flac/include/share/compat.h +++ b/chromium/third_party/flac/include/share/compat.h @@ -175,6 +175,10 @@ #define flac_fstat fstat #endif +#ifdef ANDROID +#include <limits.h> +#endif + #ifndef M_LN2 #define M_LN2 0.69314718055994530942 #endif diff --git a/chromium/third_party/flac/src/libFLAC/md5.c b/chromium/third_party/flac/src/libFLAC/md5.c index e5adc3e3574..58c9d6503dd 100644 --- a/chromium/third_party/flac/src/libFLAC/md5.c +++ b/chromium/third_party/flac/src/libFLAC/md5.c @@ -7,6 +7,7 @@ #include "private/md5.h" #include "share/alloc.h" +#include "share/compat.h" #include "share/endswap.h" /* diff --git a/chromium/third_party/flac/src/libFLAC/memory.c b/chromium/third_party/flac/src/libFLAC/memory.c index d22df70eb8a..10ed2834f78 100644 --- a/chromium/third_party/flac/src/libFLAC/memory.c +++ b/chromium/third_party/flac/src/libFLAC/memory.c @@ -40,6 +40,7 @@ #include "private/memory.h" #include "FLAC/assert.h" +#include "share/compat.h" #include "share/alloc.h" void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address) |