[Lldb-commits] [lldb] r184867 - Correct use of __FreeBSD_kernel__

[Ed Maste]

Author: emaste
Date: Tue Jun 25 13:58:11 2013
New Revision: 184867

URL: http://llvm.org/viewvc/llvm-project?rev=184867&view=rev
Log:
Correct use of __FreeBSD_kernel__

It is defined on recent FreeBSD versions, so must not be mutually
exclusive with an #elif FreeBSD block.

Patch submitted by Robert Millan.

Fixes PR#16447.

Modified:
    lldb/trunk/source/Host/common/Host.cpp

Modified: lldb/trunk/source/Host/common/Host.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/Host.cpp?rev=184867&r1=184866&r2=184867&view=diff
==============================================================================
--- lldb/trunk/source/Host/common/Host.cpp (original)
+++ lldb/trunk/source/Host/common/Host.cpp Tue Jun 25 13:58:11 2013
@@ -27,16 +27,14 @@
 #include <mach-o/dyld.h>
 #include <mach/mach_port.h>
 
-#elif defined (__linux__) || defined(__FreeBSD_kernel__)
-/*  Linux or the FreeBSD kernel with glibc (Debian KFreeBSD for example) */
+#endif
 
+#if defined (__linux__) || defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
 #include <sys/wait.h>
+#endif
 
-#elif defined (__FreeBSD__)
-
-#include <sys/wait.h>
+#if defined (__FreeBSD__)
 #include <pthread_np.h>
-
 #endif
 
 #include "lldb/Host/Host.h"