From 1931838a112a23567b41ac0f018ae811ef7fbe1c Mon Sep 17 00:00:00 2001
From: van Hauser <vh@thc.org>
Date: Fri, 17 Apr 2020 11:39:38 +0200
Subject: remove unnecessary map_size variables

---
 include/sharedmem.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'include/sharedmem.h')

diff --git a/include/sharedmem.h b/include/sharedmem.h
index 57ab6cf0..6aef4b84 100644
--- a/include/sharedmem.h
+++ b/include/sharedmem.h
@@ -44,8 +44,7 @@ typedef struct sharedmem {
 
   u8 *map;                                          /* shared memory region */
 
-  size_t size_alloc;                               /* actual allocated size */
-  size_t size_used;                                  /* in use by shmem app */
+  size_t map_size;                                 /* actual allocated size */
 
   int             cmplog_mode;
   struct cmp_map *cmp_map;
-- 
cgit 1.4.1


From 0bd1264faf928081ea2df67f4c54b5794ae82a79 Mon Sep 17 00:00:00 2001
From: Dominik Maier <domenukk@gmail.com>
Date: Fri, 17 Apr 2020 14:30:36 +0200
Subject: headers for clang-tidy

---
 include/android-ashmem.h | 4 ++++
 include/forkserver.h     | 1 +
 include/sharedmem.h      | 2 ++
 3 files changed, 7 insertions(+)

(limited to 'include/sharedmem.h')

diff --git a/include/android-ashmem.h b/include/android-ashmem.h
index 3a0b9969..6fdcb1ba 100644
--- a/include/android-ashmem.h
+++ b/include/android-ashmem.h
@@ -26,6 +26,8 @@
 #ifndef _ANDROID_ASHMEM_H
 #define _ANDROID_ASHMEM_H
 
+#ifdef __ANDROID__
+
 #include <fcntl.h>
 #include <linux/shm.h>
 #include <linux/ashmem.h>
@@ -103,5 +105,7 @@ static inline void *shmat(int __shmid, const void *__shmaddr, int __shmflg) {
 
 }
 
+#endif /* __ANDROID__ */
+
 #endif
 
diff --git a/include/forkserver.h b/include/forkserver.h
index d76dfc7a..18a287ad 100644
--- a/include/forkserver.h
+++ b/include/forkserver.h
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 
+#include "types.h"
 typedef struct afl_forkserver {
 
   /* a program that includes afl-forkserver needs to define these */
diff --git a/include/sharedmem.h b/include/sharedmem.h
index 6aef4b84..066a9904 100644
--- a/include/sharedmem.h
+++ b/include/sharedmem.h
@@ -28,6 +28,8 @@
 #ifndef __AFL_SHAREDMEM_H
 #define __AFL_SHAREDMEM_H
 
+#include "types.h"
+
 typedef struct sharedmem {
 
   // extern unsigned char *trace_bits;
-- 
cgit 1.4.1