Import LLDB as of upstream SVN r216948 (git 50f7fe44)vendor/lldb/lldb-r216948

This corresponds with the branchpoint for the 3.5 release.
A number of files not required for the FreeBSD build have been removed.

Sponsored by:	DARPA, AFRL

1 files changed, 2 insertions, 2 deletions

diff --git a/source/Target/StackFrameList.cpp b/source/Target/StackFrameList.cpp
index 631a77bd4951..99234dc61f1d 100644
--- a/source/Target/StackFrameList.cpp
+++ b/source/Target/StackFrameList.cpp
@@ -269,7 +269,7 @@ StackFrameList::GetFramesUpTo(uint32_t end_idx)
         StreamFile s(stdout, false);
 #endif
         // If we are hiding some frames from the outside world, we need to add those onto the total count of
-        // frames to fetch.  However, we don't need ot do that if end_idx is 0 since in that case we always
+        // frames to fetch.  However, we don't need to do that if end_idx is 0 since in that case we always
         // get the first concrete frame and all the inlined frames below it...  And of course, if end_idx is
         // UINT32_MAX that means get all, so just do that...
         
@@ -491,7 +491,7 @@ StackFrameList::Dump (Stream *s)
     for (pos = begin; pos != end; ++pos)
     {
         StackFrame *frame = (*pos).get();
-        s->Printf("%p: ", frame);
+        s->Printf("%p: ", static_cast<void*>(frame));
         if (frame)
         {
             frame->GetStackID().Dump (s);