Skip to content

Commit 75261fa

Browse files
committed
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
1 parent b4cee0f commit 75261fa

File tree

1 file changed

+3
-3
lines changed
  • media/libstagefright/codecs/aacenc/basic_op

1 file changed

+3
-3
lines changed

media/libstagefright/codecs/aacenc/basic_op/typedefs.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ typedef unsigned short UWord16;
7777
/*
7878
********* define 32 bit signed/unsigned types & constants
7979
*/
80-
typedef long Word32;
81-
typedef unsigned long UWord32;
80+
typedef int Word32;
81+
typedef unsigned int UWord32;
8282

8383

8484

85-
#ifdef LINUX
85+
#ifndef _MSC_VER
8686
typedef long long Word64;
8787
typedef unsigned long long UWord64;
8888
#else

0 commit comments

Comments
 (0)