From 1a4c0d2ecd428c8d3e6be8509738971861ddb5f2 Mon Sep 17 00:00:00 2001
From: vanhauser-thc <vh@thc.org>
Date: Mon, 20 Jun 2022 17:59:14 +0200
Subject: [PATCH] nits

---
 Android.bp       |  1 +
 src/afl-cc.c     |  2 +-
 src/afl-common.c | 10 +++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Android.bp b/Android.bp
index ac1d5cb640..dfbfd28146 100644
--- a/Android.bp
+++ b/Android.bp
@@ -76,6 +76,7 @@ cc_binary {
   srcs: [
     "src/afl-fuzz*.c",
     "src/afl-common.c",
+    "src/afl-forkserver.c",
     "src/afl-sharedmem.c",
     "src/afl-forkserver.c",
     "src/afl-performance.c",
diff --git a/src/afl-cc.c b/src/afl-cc.c
index 2667ae285b..4a56169f35 100644
--- a/src/afl-cc.c
+++ b/src/afl-cc.c
@@ -396,7 +396,7 @@ static void edit_params(u32 argc, char **argv, char **envp) {
           snprintf(llvm_fullpath, sizeof(llvm_fullpath), "%s/clang",
                    LLVM_BINDIR);
         else
-          snprintf(llvm_fullpath, sizeof(llvm_fullpath), CLANG_BIN);
+          snprintf(llvm_fullpath, sizeof(llvm_fullpath), "%s", CLANG_BIN);
         alt_cc = llvm_fullpath;
 
       }
diff --git a/src/afl-common.c b/src/afl-common.c
index b232b44536..7f482e7da4 100644
--- a/src/afl-common.c
+++ b/src/afl-common.c
@@ -25,8 +25,12 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#define _GNU_SOURCE
-#define __USE_GNU
+#ifndef _GNU_SOURCE
+  #define _GNU_SOURCE
+#endif
+#ifndef __USE_GNU
+  #define __USE_GNU
+#endif
 #include <string.h>
 #include <strings.h>
 #include <math.h>
@@ -718,7 +722,7 @@ char *get_afl_env(char *env) {
   if ((val = getenv(env))) {
 
     if (*val) {
-      
+
       if (!be_quiet) {
 
         OKF("Enabled environment variable %s with value %s", env, val);