Merge 10.5 into 10.6

This commit is contained in:
Marko Mäkelä 2021-02-02 15:15:53 +02:00
commit 1110beccd4
57 changed files with 1814 additions and 1446 deletions

View file

@ -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