Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"

2012-01-25 09:17:45 -08:00
parent 98539a4eba 75261fa150
commit 12045502c4
1 changed files with 3 additions and 3 deletions
--- a/media/libstagefright/codecs/aacenc/basic_op/typedefs.h
+++ b/media/libstagefright/codecs/aacenc/basic_op/typedefs.h
@@ -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