Skip to content

Commit 99e763f

Browse files
authored
Fix libafl_targets macros for windows(#2976)
1 parent 33db263 commit 99e763f

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

libafl_targets/src/cmplog.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void *__libafl_asan_region_is_poisoned(void *beg, size_t size) {
1515
return NULL;
1616
}
1717

18-
#if defined(__clang__) && defined(_MSC_VER)
18+
#if defined(__clang__)
1919
void *__asan_region_is_poisoned(void *beg, size_t size) {
2020
(void)beg;
2121
(void)size;

libafl_targets/src/common.h

+7-8
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ typedef uint128_t u128;
4343
#define MAYBE_THREAD_LOCAL
4444
#endif
4545

46-
#ifdef _WIN32
46+
#if defined _WIN32 && defined(_MSC_VER)
4747
#define RETADDR (uintptr_t) _ReturnAddress()
4848
#define EXPORT_FN __declspec(dllexport)
4949
#else
@@ -88,14 +88,13 @@ typedef uint128_t u128;
8888
#define MEMCPY memcpy
8989
#endif
9090

91-
#ifdef _WIN32
92-
93-
// From Libfuzzer
94-
// Intermediate macro to ensure the parameter is expanded before stringified.
95-
#define STRINGIFY_(A) #A
96-
#define STRINGIFY(A) STRINGIFY_(A)
97-
91+
#if defined _WIN32
9892
#if _MSC_VER
93+
// From Libfuzzer
94+
// Intermediate macro to ensure the parameter is expanded before stringified.
95+
#define STRINGIFY_(A) #A
96+
#define STRINGIFY(A) STRINGIFY_(A)
97+
9998
// Copied from compiler-rt/lib/sanitizer_common/sanitizer_win_defs.h
10099
#if defined(_M_IX86) || defined(__i386__)
101100
#define WIN_SYM_PREFIX "_"

0 commit comments

Comments
 (0)