Include System/DataTypes.h in Diagnostic.h to get intptr_t.

Set Haiku's UserLabelPrefix to "".
Patch by Paul Davey.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@118510 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/Diagnostic.h b/include/clang/Basic/Diagnostic.h
index 5f4ea0a424f3c25a43e751b1087d03945d9d061a..dba178b3ee0a5677f3a84055df5855baafcae17a 100644 (file)
--- a/include/clang/Basic/Diagnostic.h
+++ b/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/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 0bab0d247c49b8c7abbcb6bf6e1794a5e39dd249..b51ac024de18369124dc4955843563d18b080324 100644 (file)
--- a/lib/Basic/Targets.cpp
+++ b/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 {