From 7b893acdc1f66c22ab95eeb10d3357f90945a09d Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 19 Mar 2014 16:02:25 -0400 Subject: [PATCH] Don't overwrite SDL_dynapi.h in checker-buildbot.sh. --- build-scripts/checker-buildbot.sh | 7 ------- src/dynapi/SDL_dynapi.h | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build-scripts/checker-buildbot.sh b/build-scripts/checker-buildbot.sh index dd74280459af7..2e9f30e05bed6 100755 --- a/build-scripts/checker-buildbot.sh +++ b/build-scripts/checker-buildbot.sh @@ -8,8 +8,6 @@ # And download checker at http://clang-analyzer.llvm.org/ and unpack it in # /usr/local ... update CHECKERDIR as appropriate. -# this currently expects a mercurial working copy that it can modify a little. - FINALDIR="$1" CHECKERDIR="/usr/local/checker-276" @@ -53,10 +51,6 @@ set -e cd `dirname "$0"` cd .. -# Turn off the dynamic API. Makes the analysis output clearer. -echo '#pragma once' >src/dynapi/SDL_dynapi.h -echo '#define SDL_DYNAMIC_API 0' >>src/dynapi/SDL_dynapi.h - rm -rf checker-buildbot analysis if [ ! -z "$FINALDIR" ]; then rm -rf "$FINALDIR" @@ -84,7 +78,6 @@ else fi rm -rf checker-buildbot -hg revert src/dynapi/SDL_dynapi.h echo "Done. Final output is in '$FINALDIR' ..." diff --git a/src/dynapi/SDL_dynapi.h b/src/dynapi/SDL_dynapi.h index d318552f01780..144af245f2531 100644 --- a/src/dynapi/SDL_dynapi.h +++ b/src/dynapi/SDL_dynapi.h @@ -47,6 +47,8 @@ #define SDL_DYNAMIC_API 0 #elif SDL_BUILDING_WINRT /* probaly not useful on WinRT, given current .dll loading restrictions */ #define SDL_DYNAMIC_API 0 +#elif defined(__clang_analyzer__) +#define SDL_DYNAMIC_API 0 /* Turn off for static analysis, so reports are more clear. */ #else /* everyone else. */ #define SDL_DYNAMIC_API 1 #endif