Merge pull request neovim#12945 from jamessan/has_include-fix

Only use __has_include when it is defined
JudioLam9 · Sep 20, 2020 · 42d13b9 · 42d13b9
2 parents 9f704c8 + 461c18e
commit 42d13b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/nvim/log.h b/src/nvim/log.h
@@ -5,6 +5,7 @@
 #include <stdbool.h>
 
 #include "auto/config.h"
+#include "nvim/macros.h"
 
 #define DEBUG_LOG_LEVEL 0
 #define INFO_LOG_LEVEL 1
@@ -68,7 +69,7 @@
 # define LOG_CALLSTACK_TO_FILE(fp) log_callstack_to_file(fp, __func__, __LINE__)
 #endif
 
-#if defined(__has_include) && __has_include("sanitizer/asan_interface.h")
+#if NVIM_HAS_INCLUDE("sanitizer/asan_interface.h")
 # include "sanitizer/asan_interface.h"
 #endif
 

diff --git a/src/nvim/macros.h b/src/nvim/macros.h
@@ -152,6 +152,12 @@
 #define STR_(x) #x
 #define STR(x) STR_(x)
 
+#ifndef __has_include
+# define NVIM_HAS_INCLUDE(x) 0
+#else
+# define NVIM_HAS_INCLUDE __has_include
+#endif
+
 #ifndef __has_attribute
 # define NVIM_HAS_ATTRIBUTE(x) 0
 #elif defined(__clang__) && __clang__ == 1 \