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

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

llvm-svn: 118510

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>

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 {