diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2010-11-09 16:41:02 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2010-11-09 16:41:02 +0000 |
| commit | c55be6d3172a034bc8233b584bcd9a1b3ea51cf9 (patch) | |
| tree | 6f10c28d90c1e5cb193767526525d245c76eb260 | |
| parent | e5276f11ee147ea8bd17bb8d0719c7a92178622b (diff) | |
| download | bcm5719-llvm-c55be6d3172a034bc8233b584bcd9a1b3ea51cf9.tar.gz bcm5719-llvm-c55be6d3172a034bc8233b584bcd9a1b3ea51cf9.zip | |
Include System/DataTypes.h in Diagnostic.h to get intptr_t.
Set Haiku's UserLabelPrefix to "".
Patch by Paul Davey.
llvm-svn: 118510
| -rw-r--r-- | clang/include/clang/Basic/Diagnostic.h | 1 | ||||
| -rw-r--r-- | clang/lib/Basic/Targets.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/clang/include/clang/Basic/Diagnostic.h b/clang/include/clang/Basic/Diagnostic.h index 5f4ea0a424f..dba178b3ee0 100644 --- a/clang/include/clang/Basic/Diagnostic.h +++ b/clang/include/clang/Basic/Diagnostic.h @@ -19,6 +19,7 @@ #include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/type_traits.h" +#include "llvm/System/DataTypes.h" #include <string> #include <vector> #include <cassert> diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index 0bab0d247c4..b51ac024de1 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -1500,6 +1500,7 @@ public: SizeType = UnsignedLong; IntPtrType = SignedLong; PtrDiffType = SignedLong; + this->UserLabelPrefix = ""; } virtual void getTargetDefines(const LangOptions &Opts, MacroBuilder &Builder) const { |
