diff options
| author | 2011-04-05 17:35:49 +0300 | |
|---|---|---|
| committer | 2012-01-13 21:05:56 +0200 | |
| commit | 75261fa1504e80284553f38f08e8dea93f0fb4bd (patch) | |
| tree | 56cc165122a816b70389b26da9c32dbe7c271a14 | |
| parent | b4cee0f871e0f5a2abd6c6f05b65710b69423f2c (diff) | |
stagefright aacenc: Fix type definitions for 64 bit platforms
Also don't require LINUX to be defined, enable the MSVC typedefs
only within _MSC_VER.
This fixes a lot of warnings about dereferencing pointer 'winPtr'
breaking strict aliasing rules.
Change-Id: I4afbe0ed81295ebe6e5ee2c7f0fb0cc2dc83c89b
| -rw-r--r-- | media/libstagefright/codecs/aacenc/basic_op/typedefs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/aacenc/basic_op/typedefs.h b/media/libstagefright/codecs/aacenc/basic_op/typedefs.h index c924e2c2b165..2d5d9567f2db 100644 --- 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 |