diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-02 15:15:53 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-02 15:15:53 +0200 |
| commit | 1110beccd4505dd563c134623b43afcf3f205f54 (patch) | |
| tree | 7035fc7d8a4507ea6c7c3d0f74986d4168d1012e /include | |
| parent | 8a495d7f90f64566d083d9ccd04cd95023a40931 (diff) | |
| parent | b76e5c66107d75d0161d8f8ab3cf05fc360c831e (diff) | |
| download | mariadb-git-1110beccd4505dd563c134623b43afcf3f205f54.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index 081e4d6e932..da0d9920e06 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -152,7 +152,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__) || defined(__arm64__) # define SIZEOF_CHARP 8 # define SIZEOF_LONG 8 # else |