summaryrefslogtreecommitdiffstats
path: root/libSYS
diff options
context:
space:
mode:
authorMarcus Oakland <marcus.oakland@arm.com>2014-02-24 14:48:50 +0000
committerAshok Bhat <ashok.bhat@arm.com>2014-03-11 12:01:00 +0000
commitf2f96fb86d42396716b3e556da7a930956e712fb (patch)
treeb2fd224ffb2677a9975988af12b45f443ef223c0 /libSYS
parentfa3eba16446cc8f2f5e2dfc20d86a49dbd37299e (diff)
downloadfdk-aac-f2f96fb86d42396716b3e556da7a930956e712fb.tar.gz
fdk-aac-f2f96fb86d42396716b3e556da7a930956e712fb.tar.bz2
fdk-aac-f2f96fb86d42396716b3e556da7a930956e712fb.zip
AArch64: Make LONG 4 bytes
The libSYS/include/machine_type.h header file states LONG should be "Data type representing 4 byte signed integer on all supported platforms" but only provided for defining LONG as INT and ULONG as UINT when __x86_64__ was defined. This has been changed to when __LP64__ is defined, so that it also applies to AArch64. The change to libFDK/include/common_fix.h is then needed to get the project to compile. Change-Id: Iea42d7eca97dcc9da772a05b207d134cb999a72a Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Diffstat (limited to 'libSYS')
-rw-r--r--libSYS/include/machine_type.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libSYS/include/machine_type.h b/libSYS/include/machine_type.h
index 4745e43..b328953 100644
--- a/libSYS/include/machine_type.h
+++ b/libSYS/include/machine_type.h
@@ -154,15 +154,15 @@ amm-info@iis.fraunhofer.de
typedef signed int INT;
typedef unsigned int UINT;
-#ifdef __x86_64__
+#ifdef __LP64__
/* force FDK long-datatypes to 4 byte */
/* jdr: Use defines to avoid type alias problems on 64 bit machines. */
#define LONG INT
#define ULONG UINT
-#else /* __x86_64__ */
+#else /* __LP64__ */
typedef signed long LONG;
typedef unsigned long ULONG;
-#endif /* __x86_64__ */
+#endif /* __LP64__ */
typedef signed short SHORT;
typedef unsigned short USHORT;
typedef signed char SCHAR;