commit 104ab343696172890d1c0394b6185d657623eb73
author Elliott Hughes <enh@google.com> Sat Nov 22 08:04:40 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Nov 22 08:04:40 2014 +0000
tree 99ff1ab21e03b443c89702bd683fe1d53d5bfd55
parent 21b06fd124fbc2e3c0ce600bb335699bbb6cde24
parent 153de437c04acc6c4ccb97cf209b12df41191580

am 153de437: am 29a4e283: Merge "We HAVE_LITTLE_ENDIAN."

* commit '153de437c04acc6c4ccb97cf209b12df41191580':
  We HAVE_LITTLE_ENDIAN.

audio_utils/include/audio_utils/primitives.h

diff --git a/audio_utils/include/audio_utils/primitives.h b/audio_utils/include/audio_utils/primitives.h
index 060aefb..b93f649 100644
--- a/audio_utils/include/audio_utils/primitives.h
+++ b/audio_utils/include/audio_utils/primitives.h
@@ -648,14 +648,7 @@
 static inline int32_t i32_from_p24(const uint8_t *packed24)
 {
     /* convert to 32b */
-#if defined(HAVE_BIG_ENDIAN) == defined(HAVE_LITTLE_ENDIAN)
-    /* check to see if we have exactly one or the other android endian flags set. */
-#error "Either HAVE_LITTLE_ENDIAN or HAVE_BIG_ENDIAN must be defined"
-#elif defined(HAVE_BIG_ENDIAN)
-    return (packed24[2] << 8) | (packed24[1] << 16) | (packed24[0] << 24);
-#else /* HAVE_LITTLE_ENDIAN */
     return (packed24[0] << 8) | (packed24[1] << 16) | (packed24[2] << 24);
-#endif
 }
 
 /* Convert a 32-bit Q0.31 value to single-precision floating-point.