diff --git a/cs.c b/cs.c index 65f89b8e5b..6da1f5a589 100644 --- a/cs.c +++ b/cs.c @@ -32,6 +32,8 @@ #pragma message(CAPSTONE_MSVC_WRANING_PREFIX "Windows driver does not support full features for selected architecture(s). Define CAPSTONE_DIET to compile Capstone with only supported features. See issue #681 for details.") +// Some change + #undef CAPSTONE_MSVC_WRANING_PREFIX #undef CAPSTONE_STR #undef CAPSTONE_STR_INTERNAL diff --git a/run-clang-tidy.sh b/run-clang-tidy.sh index 02dab2722f..5298f11b81 100755 --- a/run-clang-tidy.sh +++ b/run-clang-tidy.sh @@ -15,7 +15,7 @@ top_level=$(git rev-parse --show-toplevel) echo "\n\n###### REPORT\n\n" -git pull origin next +git pull --ff-only origin next changed_files=$(git diff --name-only origin/next) if [ $? -ne 0 ]; then echo "Failed to get changed files."