Index: source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
===================================================================
--- source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp	(revision 107688)
+++ source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp	(working copy)
@@ -616,7 +616,7 @@
 }
 
 Error
-ProcessGDBRemote::DoAttach (pid_t attach_pid)
+ProcessGDBRemote::DoAttach (lldb::pid_t attach_pid)
 {
     Error error;
     // Clear out and clean up from any current state
Index: source/Host/macosx/Host.mm
===================================================================
--- source/Host/macosx/Host.mm	(revision 107688)
+++ source/Host/macosx/Host.mm	(working copy)
@@ -554,7 +554,7 @@
         Mutex::Locker locker(&g_monitor_map_mutex);
         if (!g_monitor_thread)
         {
-            pid_t wait_pid = -1;
+            lldb::pid_t wait_pid = -1;
             g_monitor_thread = ThreadCreate ("<lldb.host.wait4>",
                                              MonitorChildProcessThreadFunction,
                                              &wait_pid,
@@ -640,7 +640,7 @@
     if (log)
         log->Printf ("%s (arg = %p) thread starting...", function, arg);
 
-    const pid_t wait_pid = -1;//*((pid_t*)arg);
+    const lldb::pid_t wait_pid = -1;//*((pid_t*)arg);
     int status = -1;
     const int options = 0;
     struct rusage *rusage = NULL;