Index: source/Plugins/Process/Utility/libunwind/src/RemoteProcInfo.hpp
===================================================================
--- source/Plugins/Process/Utility/libunwind/src/RemoteProcInfo.hpp	(revision 107860)
+++ source/Plugins/Process/Utility/libunwind/src/RemoteProcInfo.hpp	(working copy)
@@ -417,7 +417,7 @@
         img = &i->second;
       }
     else
-      return false;
+      return NULL;
     std::map<uint64_t, RemoteUnwindProfile *>::iterator j;
     j = img->profiles.lower_bound (pc);
     if (j == img->profiles.begin() && j == img->profiles.end())
Index: source/Plugins/Process/Utility/libunwind/src/DwarfParser.hpp
===================================================================
--- source/Plugins/Process/Utility/libunwind/src/DwarfParser.hpp	(revision 107860)
+++ source/Plugins/Process/Utility/libunwind/src/DwarfParser.hpp	(working copy)
@@ -390,7 +390,7 @@
 		cieContentEnd = p + cieLength;
 	}
 	if ( cieLength == 0 ) 
-		return false;	
+		return NULL;	
 	// CIE ID is always 0
 	if ( addressSpace.get32(p) != 0 ) 
 		return "CIE ID is not zero";
Index: source/Symbol/ClangASTContext.cpp
===================================================================
--- source/Symbol/ClangASTContext.cpp	(revision 107860)
+++ source/Symbol/ClangASTContext.cpp	(working copy)
@@ -1266,7 +1266,7 @@
             break;
         }
     }
-    return false;
+    return NULL;
 }
 
 static inline bool
Index: source/Symbol/Type.cpp
===================================================================
--- source/Symbol/Type.cpp	(revision 107860)
+++ source/Symbol/Type.cpp	(working copy)
@@ -1536,7 +1536,7 @@
 )
 {
     if (!ResolveClangType())
-        return false;
+        return NULL;
 
     std::string name_str;
     void *child_qual_type = GetClangASTContext().GetChildClangTypeAtIndex (
Index: source/Target/Thread.cpp
===================================================================
--- source/Target/Thread.cpp	(revision 107860)
+++ source/Target/Thread.cpp	(working copy)
@@ -938,7 +938,7 @@
     {
         thread_plan_sp.reset(new ThreadPlanStepThrough (*this, stop_other_threads));
         if (thread_plan_sp && !thread_plan_sp->ValidatePlan (NULL))
-            return false;
+            return NULL;
     }
     QueueThreadPlan (thread_plan_sp, abort_other_plans);
     return thread_plan_sp.get();
Index: source/Core/ConnectionFileDescriptor.cpp
===================================================================
--- source/Core/ConnectionFileDescriptor.cpp	(revision 107860)
+++ source/Core/ConnectionFileDescriptor.cpp	(working copy)
@@ -406,7 +406,7 @@
                                  "%p ConnectionFileDescriptor::SocketListen (port = %i)",
                                  this, listen_port_num);
 
-    Close (m_fd, false);
+    Close (m_fd, NULL);
     m_is_socket = true;
     int listen_port = ::socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
     if (listen_port == -1)
@@ -470,7 +470,7 @@
     lldb_private::LogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION,
                                  "%p ConnectionFileDescriptor::SocketConnect (host/port = %s)",
                                  this, host_and_port);
-    Close (m_fd, false);
+    Close (m_fd, NULL);
     m_is_socket = true;
 
     RegularExpression regex ("([^:]+):([0-9]+)");
@@ -534,7 +534,7 @@
                 else
                     error_ptr->SetErrorStringWithFormat("Invalid host string: '%s'.\n", host_str.c_str());
             }
-            Close (m_fd, false);
+            Close (m_fd, NULL);
             return eConnectionStatusError;
         }
     }
@@ -543,7 +543,7 @@
     {
         if (error_ptr)
             error_ptr->SetErrorToErrno();
-        Close (m_fd, false);
+        Close (m_fd, NULL);
         return eConnectionStatusError;
     }
 
Index: source/Host/macosx/cfcpp/CFCMutableSet.cpp
===================================================================
--- source/Host/macosx/cfcpp/CFCMutableSet.cpp	(revision 107860)
+++ source/Host/macosx/cfcpp/CFCMutableSet.cpp	(working copy)
@@ -84,7 +84,7 @@
     if (set == NULL)
     {
         if (can_create == false)
-            return false;
+            return NULL;
         set = ::CFSetCreateMutable(kCFAllocatorDefault, 0, &kCFTypeSetCallBacks);
         reset ( set );
     }
Index: include/lldb/Interpreter/CommandObjectRegexCommand.h
===================================================================
--- include/lldb/Interpreter/CommandObjectRegexCommand.h	(revision 107860)
+++ include/lldb/Interpreter/CommandObjectRegexCommand.h	(working copy)
@@ -52,7 +52,7 @@
     AddRegexCommand (const char *re_cstr, const char *command_cstr);
 
 protected:
-    typedef struct Entry
+    struct Entry
     {
         RegularExpression regex;
         std::string command;