From: Ted Kremenek Date: Wed, 3 Mar 2010 01:02:48 +0000 (+0000) Subject: Make getClangRevision() check that SVN_VERSION is an empty string X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=971cc48dcae6719dc9e4e555fc4fcae8afc680fc;p=clang Make getClangRevision() check that SVN_VERSION is an empty string (even if it is defined). This fixes the issue of this function returning '0' when SVN_VERSION is defined to be "". Fixes: git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@97620 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Basic/Version.cpp b/lib/Basic/Version.cpp index 434ddf3f57..0c58b6007d 100644 --- a/lib/Basic/Version.cpp +++ b/lib/Basic/Version.cpp @@ -40,15 +40,15 @@ llvm::StringRef getClangRepositoryPath() { } std::string getClangRevision() { -#ifndef SVN_REVISION - // Subversion was not available at build time? - return ""; -#else - std::string revision; - llvm::raw_string_ostream OS(revision); - OS << strtol(SVN_REVISION, 0, 10); - return revision; +#ifdef SVN_REVISION + if (SVN_VERSION[0] != '\0') { + std::string revision; + llvm::raw_string_ostream OS(revision); + OS << strtol(SVN_REVISION, 0, 10); + return revision; + } #endif + return ""; } std::string getClangFullRepositoryVersion() {