Merge pull request #12945 from jamessan/has_include-fix

Only use __has_include when it is defined
This commit is contained in:
James McCoy 2020-09-20 14:57:20 -04:00 committed by GitHub
commit 42d13b90fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions

View File

@ -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

View File

@ -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 \