diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2010-08-31 10:10:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-31 10:10:20 -0700 |
| commit | 2deeff11560b81069ceef89d0268d84f87e603e9 (patch) | |
| tree | fefe2d5ee4c4515a24650c21478583d8bf34807d /media/libmedia | |
| parent | 258b173c805937bf8621d4ba220f0b3ad5e7d539 (diff) | |
| parent | 1577e629866b2700e31c9467478e05ebffcc69a1 (diff) | |
| download | frameworks_base-2deeff11560b81069ceef89d0268d84f87e603e9.zip frameworks_base-2deeff11560b81069ceef89d0268d84f87e603e9.tar.gz frameworks_base-2deeff11560b81069ceef89d0268d84f87e603e9.tar.bz2 | |
am 1577e629: am 12006013: fixedfft: Only includes cpu-features.h when __arm__ is defined.
Merge commit '1577e629866b2700e31c9467478e05ebffcc69a1'
* commit '1577e629866b2700e31c9467478e05ebffcc69a1':
fixedfft: Only includes cpu-features.h when __arm__ is defined.
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/fixedfft.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/fixedfft.cpp b/media/libmedia/fixedfft.cpp index 9cf05ba..2b495e6 100644 --- a/media/libmedia/fixedfft.cpp +++ b/media/libmedia/fixedfft.cpp @@ -26,7 +26,7 @@ #include <stdio.h> #include <stdint.h> -#ifdef __ARM_ARCH__ +#ifdef __arm__ #include <machine/cpu-features.h> #endif |