From 99e763ff7db31aea52c38f12489a1e199dc6fed6 Mon Sep 17 00:00:00 2001
From: "Dongjia \"toka\" Zhang" <tokazerkje@outlook.com>
Date: Thu, 13 Feb 2025 12:18:04 +0100
Subject: [PATCH] Fix libafl_targets macros for windows(#2976)

---
 libafl_targets/src/cmplog.c |  2 +-
 libafl_targets/src/common.h | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/libafl_targets/src/cmplog.c b/libafl_targets/src/cmplog.c
index db4d51b667..675cf7171d 100644
--- a/libafl_targets/src/cmplog.c
+++ b/libafl_targets/src/cmplog.c
@@ -15,7 +15,7 @@ void *__libafl_asan_region_is_poisoned(void *beg, size_t size) {
   return NULL;
 }
 
-  #if defined(__clang__) && defined(_MSC_VER)
+  #if defined(__clang__)
 void *__asan_region_is_poisoned(void *beg, size_t size) {
   (void)beg;
   (void)size;
diff --git a/libafl_targets/src/common.h b/libafl_targets/src/common.h
index 0852f94c20..478b53ac6d 100644
--- a/libafl_targets/src/common.h
+++ b/libafl_targets/src/common.h
@@ -43,7 +43,7 @@ typedef uint128_t         u128;
   #define MAYBE_THREAD_LOCAL
 #endif
 
-#ifdef _WIN32
+#if defined _WIN32 && defined(_MSC_VER)
   #define RETADDR (uintptr_t) _ReturnAddress()
   #define EXPORT_FN __declspec(dllexport)
 #else
@@ -88,14 +88,13 @@ typedef uint128_t         u128;
   #define MEMCPY memcpy
 #endif
 
-#ifdef _WIN32
-
-  // From Libfuzzer
-  // Intermediate macro to ensure the parameter is expanded before stringified.
-  #define STRINGIFY_(A) #A
-  #define STRINGIFY(A) STRINGIFY_(A)
-
+#if defined _WIN32
   #if _MSC_VER
+    // From Libfuzzer
+    // Intermediate macro to ensure the parameter is expanded before stringified.
+    #define STRINGIFY_(A) #A
+    #define STRINGIFY(A) STRINGIFY_(A)
+
     // Copied from compiler-rt/lib/sanitizer_common/sanitizer_win_defs.h
     #if defined(_M_IX86) || defined(__i386__)
       #define WIN_SYM_PREFIX "_"