Index: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformiOSSimulatorCoreSimulatorSupport.h
===================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformiOSSimulatorCoreSimulatorSupport.h
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformiOSSimulatorCoreSimulatorSupport.h
@@ -36,7 +36,7 @@
     class Process
     {
     public:
-        pid_t
+        lldb::pid_t
         GetPID ()
         {
             return m_pid;
@@ -54,13 +54,13 @@
         }
         
     private:
-        Process (pid_t p);
+        Process (lldb::pid_t p);
         
         Process(lldb_private::Error error);
 
-        Process (pid_t p, lldb_private::Error error);
+        Process (lldb::pid_t p, lldb_private::Error error);
         
-        pid_t m_pid;
+        lldb::pid_t m_pid;
         lldb_private::Error m_error;
         
         friend class Device;
Index: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformiOSSimulatorCoreSimulatorSupport.mm
===================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformiOSSimulatorCoreSimulatorSupport.mm
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformiOSSimulatorCoreSimulatorSupport.mm
@@ -47,10 +47,10 @@
 - (NSUInteger) state;
 - (BOOL) shutdownWithError:(NSError **)error;
 - (NSUUID *) UDID;
-- (pid_t) spawnWithPath:(NSString *)path options:(NSDictionary *)options terminationHandler:(void (^)(int status)) terminationHandler error:(NSError **)error;
+- (lldb::pid_t) spawnWithPath:(NSString *)path options:(NSDictionary *)options terminationHandler:(void (^)(int status)) terminationHandler error:(NSError **)error;
 @end
 
-CoreSimulatorSupport::Process::Process (pid_t p) :
+CoreSimulatorSupport::Process::Process (lldb::pid_t p) :
     m_pid (p),
     m_error ()
 {
@@ -62,7 +62,7 @@
 {
 }
 
-CoreSimulatorSupport::Process::Process (pid_t p, Error error) :
+CoreSimulatorSupport::Process::Process (lldb::pid_t p, Error error) :
     m_pid (p),
     m_error (error)
 {
@@ -661,7 +661,7 @@
     
     NSError* nserror;
     
-    pid_t pid = [m_dev spawnWithPath: [NSString stringWithUTF8String: launch_info.GetExecutableFile().GetPath().c_str()]
+    lldb::pid_t pid = [m_dev spawnWithPath: [NSString stringWithUTF8String: launch_info.GetExecutableFile().GetPath().c_str()]
                              options: options
                   terminationHandler: nil
                                error: &nserror];