summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-10-13 11:38:21 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-10-13 11:38:21 +0300
commit4a7dfda373ff9e28e4f4f35bad76cbfc20934a9a (patch)
treec8b327da16aa30bc5a26bfa31a2563af1c6f4976 /include/my_global.h
parentff77a09bda884fe6bf3917eb29b9d3a2f53f919b (diff)
parent2bb8d7c2f36439ab6a3944476665eb1218c36f5c (diff)
downloadmariadb-git-4a7dfda373ff9e28e4f4f35bad76cbfc20934a9a.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'include/my_global.h')
-rw-r--r--include/my_global.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h
index b96a04f4566..9eb12ee003b 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -164,7 +164,7 @@
# if defined(__i386__) || defined(__ppc__)
# define SIZEOF_CHARP 4
# define SIZEOF_LONG 4
-# elif defined(__x86_64__) || defined(__ppc64__)
+# elif defined(__x86_64__) || defined(__ppc64__) || defined(__aarch64__)
# define SIZEOF_CHARP 8
# define SIZEOF_LONG 8
# else