summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-03-19 21:13:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-19 21:13:03 +0000
commit629f60c0e71f4a5ad273d5ab3fc6964e5eb1f9f4 (patch)
tree43beacbb39e62239ffd53b552ab378c5b239162b
parent47c680c62246594107da0a8995c953dfb8040bce (diff)
parent3252951f61e011241ce6dd8fff775fe9b9aed97f (diff)
downloadfdk-aac-629f60c0e71f4a5ad273d5ab3fc6964e5eb1f9f4.tar.gz
fdk-aac-629f60c0e71f4a5ad273d5ab3fc6964e5eb1f9f4.tar.bz2
fdk-aac-629f60c0e71f4a5ad273d5ab3fc6964e5eb1f9f4.zip
am 3252951f: Merge "Temporary workaround for 64-bit build error"
* commit '3252951f61e011241ce6dd8fff775fe9b9aed97f': Temporary workaround for 64-bit build error
-rw-r--r--libFDK/include/FDK_archdef.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libFDK/include/FDK_archdef.h b/libFDK/include/FDK_archdef.h
index da63aee..5dbc138 100644
--- a/libFDK/include/FDK_archdef.h
+++ b/libFDK/include/FDK_archdef.h
@@ -203,7 +203,7 @@ amm-info@iis.fraunhofer.de
#else
- #error >>>> Please set architecture characterization defines for your platform (FDK_HIGH_PERFORMANCE)! <<<<
+ #warning >>>> Please set architecture characterization defines for your platform (FDK_HIGH_PERFORMANCE)! <<<<
#endif /* Architecture switches */