diff options
author | van Hauser <vh@thc.org> | 2020-05-15 08:36:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-15 08:36:51 +0200 |
commit | 87a693d1a956fd0fcb0ebbdecff24053b69e8560 (patch) | |
tree | 34578ae146ad79b7748363f23fe022a8e6c1a76d /include/android-ashmem.h | |
parent | 1317433a51a7f7336c82c80a592835ddda9ef60f (diff) | |
parent | 49bd24144a881f4f55ef1a3db9a7f129a6670488 (diff) | |
download | afl++-87a693d1a956fd0fcb0ebbdecff24053b69e8560.tar.gz |
Merge pull request #360 from AFLplusplus/dev 2.65c
new code formatting + applied
Diffstat (limited to 'include/android-ashmem.h')
-rw-r--r-- | include/android-ashmem.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/include/android-ashmem.h b/include/android-ashmem.h index 77914c35..41d4d2da 100644 --- a/include/android-ashmem.h +++ b/include/android-ashmem.h @@ -28,27 +28,27 @@ #ifdef __ANDROID__ -#include <fcntl.h> -#include <linux/shm.h> -#include <linux/ashmem.h> -#include <sys/ioctl.h> -#include <sys/mman.h> - -#if __ANDROID_API__ >= 26 -#define shmat bionic_shmat -#define shmctl bionic_shmctl -#define shmdt bionic_shmdt -#define shmget bionic_shmget -#endif - -#include <sys/shm.h> -#undef shmat -#undef shmctl -#undef shmdt -#undef shmget -#include <stdio.h> - -#define ASHMEM_DEVICE "/dev/ashmem" + #include <fcntl.h> + #include <linux/shm.h> + #include <linux/ashmem.h> + #include <sys/ioctl.h> + #include <sys/mman.h> + + #if __ANDROID_API__ >= 26 + #define shmat bionic_shmat + #define shmctl bionic_shmctl + #define shmdt bionic_shmdt + #define shmget bionic_shmget + #endif + + #include <sys/shm.h> + #undef shmat + #undef shmctl + #undef shmdt + #undef shmget + #include <stdio.h> + + #define ASHMEM_DEVICE "/dev/ashmem" static inline int shmctl(int __shmid, int __cmd, struct shmid_ds *__buf) { |