<div dir="ltr">Yeah I was actually going to revert that back to ProcessMonitor.h (without path) and have Tong rework the Android.mk build to provide proper pathing to the Linux one in the header dirs.  But this'll work for now.<div><br></div><div>-Todd</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Oct 1, 2014 at 5:56 AM, Ed Maste <span dir="ltr"><<a href="mailto:emaste@freebsd.org" target="_blank">emaste@freebsd.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: emaste<br>
Date: Wed Oct  1 07:56:39 2014<br>
New Revision: 218762<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=218762&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=218762&view=rev</a><br>
Log:<br>
Add a bandaid to fix the FreeBSD build<br>
<br>
r218568 added an explicit #include of the Linux ProcessMonitor.h to<br>
POSIXThread.cpp, rather than including just "ProcessMonitor.h" and<br>
relying on the build infrastructure for the appropriate paths.<br>
<br>
For now add #ifdefs in the source to use the FreeBSD or Linux header<br>
as appropriate; a cleaner fix (and perhaps some refactoring of the<br>
POSIX classes) should still be done later.<br>
<br>
Modified:<br>
    lldb/trunk/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp<br>
<br>
Modified: lldb/trunk/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp?rev=218762&r1=218761&r2=218762&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp?rev=218762&r1=218761&r2=218762&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp (original)<br>
+++ lldb/trunk/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp Wed Oct  1 07:56:39 2014<br>
@@ -12,7 +12,11 @@<br>
<br>
 #include "Plugins/Process/POSIX/ProcessPOSIX.h"<br>
 #include "RegisterContextPOSIXProcessMonitor_x86.h"<br>
+#if defined(__FreeBSD__)<br>
+#include "Plugins/Process/FreeBSD/ProcessMonitor.h"<br>
+#elif defined(__linux__)<br>
 #include "Plugins/Process/Linux/ProcessMonitor.h"<br>
+#endif<br>
<br>
 using namespace lldb_private;<br>
 using namespace lldb;<br>
<br>
<br>
_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@cs.uiuc.edu">lldb-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div dir="ltr"><table cellspacing="0" cellpadding="0" style="color:rgb(136,136,136);font-family:'Times New Roman'"><tbody><tr style="color:rgb(85,85,85);font-family:sans-serif;font-size:small"><td nowrap style="border-top-style:solid;border-top-color:rgb(213,15,37);border-top-width:2px">Todd Fiala |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(51,105,232);border-top-width:2px"> Software Engineer |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(0,153,57);border-top-width:2px"> <a href="mailto:tfiala@google.com" style="color:rgb(17,85,204)" target="_blank"><span style="background-color:rgb(255,255,204);color:rgb(34,34,34);background-repeat:initial initial">tfiala@google.com</span></a></td><td nowrap style="border-top-style:solid;border-top-color:rgb(238,178,17);border-top-width:2px"><br></td></tr></tbody></table><br></div>
</div>