[gdb, hurd] Work around conflict between Mach's 'thread_info' function, and GDB's...

[deliverable/binutils-gdb.git] / gdb / gnu-nat.h

diff --git a/gdb/gnu-nat.h b/gdb/gnu-nat.h
index 9df479c8506a72ff7f6ebefa2b8f9e71d790a833..dbad0cac93f78577627f1fa77ba1f3fdf1944664 100644 (file)
--- a/gdb/gnu-nat.h
+++ b/gdb/gnu-nat.h
@@ -19,8 +19,21 @@
 #ifndef GNU_NAT_H
 #define GNU_NAT_H
 
-#include <unistd.h>
+#include "defs.h"
+
+/* Work around conflict between Mach's 'thread_info' function, and GDB's
+   'thread_info' class.  Make the former available as 'mach_thread_info'.  */
+#define thread_info mach_thread_info
+/* Mach headers are not yet ready for C++ compilation.  */
+extern "C"
+{
 #include <mach.h>
+}
+#undef thread_info
+/* Divert 'mach_thread_info' to the original Mach 'thread_info' function.  */
+extern __typeof__ (mach_thread_info) mach_thread_info asm ("thread_info");
+
+#include <unistd.h>
 
 struct inf;