← Back to branch summary

~chromium-team/chromium-browser/horizon

« back to all changes in this revision

Viewing changes to debian/patches/stdatomic

  • Committer: Chad MILLER
  • Date: 2017-03-01 18:52:28 UTC
  • Revision ID: chad.miller@canonical.com-20170301185228-5rcl14kwuw81o6i5
* Upstream beta: 57.0.2987.74.
* debian/patches/stdatomic: Support gcc48.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/stdatomic
 
1
Description: Upstream doesn't use gcc. The gcc in Trusty- doesn't have stdatomic.h
 
2
  See https://bugs.launchpad.net/oxide/+bug/1668614
 
3
 
 
4
--- a/third_party/ffmpeg/libavutil/cpu.c
 
5
+++ b/third_party/ffmpeg/libavutil/cpu.c
 
6
@@ -20,6 +20,9 @@
 
7
 // Chromium: Windows doesn't provide stdatomic.h, so use the compat version.
 
8
 #if defined(_MSC_VER)
 
9
 #include <compat/atomics/win32/stdatomic.h>
 
10
+// Ubuntu 14.04 gcc doesn't provide stdatomic.h, so use the compat version
 
11
+#elif defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 8
 
12
+#include <compat/atomics/gcc/stdatomic.h>
 
13
 #else
 
14
 #include <stdatomic.h>
 
15
 #endif