diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2010-08-30 22:06:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-30 22:06:39 -0700 |
| commit | eebcf36cf2db2563af8ef479e01747321aa959e8 (patch) | |
| tree | dd2134fbd52e09dfce2874cc59505d97fdac150a /media | |
| parent | d81ef83a493a27887b795fdf9ece391155779914 (diff) | |
| parent | 5edae619a6ad7337a3d14b53f7665ff17ec3ee84 (diff) | |
| download | frameworks_av-eebcf36cf2db2563af8ef479e01747321aa959e8.zip frameworks_av-eebcf36cf2db2563af8ef479e01747321aa959e8.tar.gz frameworks_av-eebcf36cf2db2563af8ef479e01747321aa959e8.tar.bz2 | |
am 12006013: fixedfft: Only includes cpu-features.h when __arm__ is defined.
Merge commit '12006013cc2cd0a076855ed068f5f782b24631c3' into gingerbread-plus-aosp
* commit '12006013cc2cd0a076855ed068f5f782b24631c3':
fixedfft: Only includes cpu-features.h when __arm__ is defined.
Diffstat (limited to 'media')
| -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 |