1 diff -Naur qt-5.5.1_SRC_orig/qtwebengine/src/3rdparty/chromium/third_party/mojo/src/mojo/public/c/system/macros.h qt-5.5.1_SRC_modif/qtwebengine/src/3rdparty/chromium/third_party/mojo/src/mojo/public/c/system/macros.h
2 --- qt-5.5.1_SRC_orig/qtwebengine/src/3rdparty/chromium/third_party/mojo/src/mojo/public/c/system/macros.h 2015-10-13 07:35:48.000000000 +0300
3 +++ qt-5.5.1_SRC_modif/qtwebengine/src/3rdparty/chromium/third_party/mojo/src/mojo/public/c/system/macros.h 2015-12-23 11:18:45.000000000 +0300
5 // Unlike the C++11 |alignas()|, |alignment| must be an integer. It may not be a
6 // type, nor can it be an expression like |MOJO_ALIGNOF(type)| (due to the
7 // non-C++11 MSVS version).
8 -#if __cplusplus >= 201103L
10 + #if (__GNUC__<=4) and (_GNUC_MINOR__<= 7)
11 + #define MOJO_ALIGNAS(alignment) __attribute__((aligned(alignment)))
13 + #if __cplusplus >= 201103L
14 + #define MOJO_ALIGNAS(alignment) alignas(alignment)
16 + #define MOJO_ALIGNAS(alignment) __attribute__((aligned(alignment)))
19 +#elif __cplusplus >= 201103L
20 #define MOJO_ALIGNAS(alignment) alignas(alignment)
21 -#elif defined(__GNUC__)
22 -#define MOJO_ALIGNAS(alignment) __attribute__((aligned(alignment)))
23 #elif defined(_MSC_VER)
24 #define MOJO_ALIGNAS(alignment) __declspec(align(alignment))