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

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

View File

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