From 877b2bcab614fdc4a076cf940fda8d0b11b95d42 Mon Sep 17 00:00:00 2001
From: vanhauser-thc <vh@thc.org>
Date: Fri, 7 Jul 2023 15:03:31 +0200
Subject: add limits.h to afl-ld-lto

---
 src/afl-ld-lto.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/afl-ld-lto.c')

diff --git a/src/afl-ld-lto.c b/src/afl-ld-lto.c
index 420dd817..cb76ba9c 100644
--- a/src/afl-ld-lto.c
+++ b/src/afl-ld-lto.c
@@ -37,6 +37,7 @@
 #include <time.h>
 #include <ctype.h>
 #include <fcntl.h>
+#include <limits.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
-- 
cgit 1.4.1


From e71de2f2b8f4507edef752ce865e49ef2d389e3e Mon Sep 17 00:00:00 2001
From: fuzzah <fuzzah@tuta.io>
Date: Fri, 7 Jul 2023 16:57:45 +0300
Subject: remove extra limits.h in afl-ld-lto for BSD

---
 src/afl-ld-lto.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/afl-ld-lto.c')

diff --git a/src/afl-ld-lto.c b/src/afl-ld-lto.c
index cb76ba9c..b306c8d5 100644
--- a/src/afl-ld-lto.c
+++ b/src/afl-ld-lto.c
@@ -46,11 +46,6 @@
 
 #include <dirent.h>
 
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
-    defined(__DragonFly__)
-  #include <limits.h>
-#endif
-
 #ifdef __APPLE__
   #include <sys/syslimits.h>
 #endif
-- 
cgit 1.4.1


From 2a34e845072204b29200bf0e480d1d4f2201b332 Mon Sep 17 00:00:00 2001
From: vanhauser-thc <vh@thc.org>
Date: Wed, 12 Jul 2023 16:08:22 +0200
Subject: nits

---
 include/afl-fuzz.h       | 2 +-
 include/android-ashmem.h | 4 +++-
 src/afl-ld-lto.c         | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/afl-ld-lto.c')

diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h
index 9da5cc03..27668da0 100644
--- a/include/afl-fuzz.h
+++ b/include/afl-fuzz.h
@@ -31,7 +31,7 @@
 #define MESSAGES_TO_STDOUT
 
 #ifndef _GNU_SOURCE
-  #define _GNU_SOURCE 1
+  #define _GNU_SOURCE
 #endif
 #ifndef _FILE_OFFSET_BITS
   #define _FILE_OFFSET_BITS 64
diff --git a/include/android-ashmem.h b/include/android-ashmem.h
index 1bfd3220..065c213b 100644
--- a/include/android-ashmem.h
+++ b/include/android-ashmem.h
@@ -2,7 +2,9 @@
   #ifndef _ANDROID_ASHMEM_H
     #define _ANDROID_ASHMEM_H
 
-    #define _GNU_SOURCE
+    #ifndef _GNU_SOURCE
+      #define _GNU_SOURCE
+    #endif
     #include <sys/syscall.h>
     #include <unistd.h>
     #include <fcntl.h>
diff --git a/src/afl-ld-lto.c b/src/afl-ld-lto.c
index b306c8d5..b1e6c848 100644
--- a/src/afl-ld-lto.c
+++ b/src/afl-ld-lto.c
@@ -23,7 +23,9 @@
 */
 
 #define AFL_MAIN
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+  #define _GNU_SOURCE
+#endif
 
 #include "config.h"
 #include "types.h"
-- 
cgit 1.4.1