am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3': stagefright aacenc: Fix type definitions for 64 bit platforms
This commit is contained in:
committed by
Android Git Automerger
commit
64085d03ef
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user