am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"

* commit '64085d03efcd2abf3b8cd64f4e6344a1ece014c3':
  stagefright aacenc: Fix type definitions for 64 bit platforms
This commit is contained in:
Jean-Baptiste Queru
2012-01-25 10:30:31 -08:00
committed by Android Git Automerger

View File

@@ -77,12 +77,12 @@ typedef unsigned short UWord16;
/* /*
********* define 32 bit signed/unsigned types & constants ********* define 32 bit signed/unsigned types & constants
*/ */
typedef long Word32; typedef int Word32;
typedef unsigned long UWord32; typedef unsigned int UWord32;
#ifdef LINUX #ifndef _MSC_VER
typedef long long Word64; typedef long long Word64;
typedef unsigned long long UWord64; typedef unsigned long long UWord64;
#else #else