Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(486)

Side by Side Diff: third_party/instrumented_libraries/patches/pulseaudio.diff

Issue 361473002: Instrumented libraries: improve handling of custom patches. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use -i to pass filename to patch Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 diff -rupN ./src/modules/bluetooth/sbc/sbc_primitives_mmx.h ../pulseaudio-1.1-pa tched/src/modules/bluetooth/sbc/sbc_primitives_mmx.h 1 diff -rupN ./src/modules/bluetooth/sbc/sbc_primitives_mmx.h ../pulseaudio-1.1-pa tched/src/modules/bluetooth/sbc/sbc_primitives_mmx.h
2 --- ./src/modules/bluetooth/sbc/sbc_primitives_mmx.h 2011-10-20 16:54:16.0000 00000 +0400 2 --- ./src/modules/bluetooth/sbc/sbc_primitives_mmx.h 2011-10-20 16:54:16.0000 00000 +0400
3 +++ ../pulseaudio-1.1-patched/src/modules/bluetooth/sbc/sbc_primitives_mmx.h 2014-01-30 16:57:43.113946495 +0400 3 +++ ../pulseaudio-1.1-patched/src/modules/bluetooth/sbc/sbc_primitives_mmx.h 2014-01-30 16:57:43.113946495 +0400
4 @@ -29,8 +29,11 @@ 4 @@ -29,8 +29,11 @@
5 5
6 #include "sbc_primitives.h" 6 #include "sbc_primitives.h"
7 7
8 +// The inline asm causes errors in clang builds. We don't want inline asm in 8 +// The inline asm causes errors in clang builds. We don't want inline asm in
9 +// instrumented builds anyway. 9 +// instrumented builds anyway.
10 #if defined(__GNUC__) && (defined(__i386__) || defined(__amd64__)) && \ 10 #if defined(__GNUC__) && (defined(__i386__) || defined(__amd64__)) && \
11 - !defined(SBC_HIGH_PRECISION) && (SCALE_OUT_BITS == 15) 11 - !defined(SBC_HIGH_PRECISION) && (SCALE_OUT_BITS == 15)
12 + !defined(SBC_HIGH_PRECISION) && (SCALE_OUT_BITS == 15) && \ 12 + !defined(SBC_HIGH_PRECISION) && (SCALE_OUT_BITS == 15) && \
13 + !defined(__clang__) 13 + !defined(__clang__)
14 14
15 #define SBC_BUILD_WITH_MMX_SUPPORT 15 #define SBC_BUILD_WITH_MMX_SUPPORT
16 16
OLDNEW
« no previous file with comments | « third_party/instrumented_libraries/patches/nss.diff ('k') | third_party/instrumented_libraries/patches/zlib1g.diff » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698