summaryrefslogtreecommitdiffstats
path: root/libSYS/include
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-04-09 15:49:10 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-09 15:49:10 +0000
commit35f30c5ab8089f38681d2fdd416c00aebef5a7ff (patch)
tree2a0df3c0e70e33af5462bf46f1ddc3ba103d5fe1 /libSYS/include
parent3252951f61e011241ce6dd8fff775fe9b9aed97f (diff)
parentf2f96fb86d42396716b3e556da7a930956e712fb (diff)
downloadfdk-aac-35f30c5ab8089f38681d2fdd416c00aebef5a7ff.tar.gz
fdk-aac-35f30c5ab8089f38681d2fdd416c00aebef5a7ff.tar.bz2
fdk-aac-35f30c5ab8089f38681d2fdd416c00aebef5a7ff.zip
Merge "AArch64: Make LONG 4 bytes"
Diffstat (limited to 'libSYS/include')
-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;