From 2db3b238966f5f326010321b698fa938d65b8e8a Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Tue, 5 Apr 2011 17:35:49 +0300 Subject: [PATCH] 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 --- media/libstagefright/codecs/aacenc/basic_op/typedefs.h | 6 +++--- 1 file 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 c924e2c2b1..2d5d9567f2 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 -- 2.11.0