X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgdb_proc_service.h;h=0a9f26d47e6654f8816b8432f9c7f727a8be0adc;hb=ad43e107eb233dcef8e76da6328aa4e4d74afd84;hp=2c633b3e4b4ef9be7b1757501c93a385f639716a;hpb=32d0add0a654c1204ab71dc8a55d9374538c4b33;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/gdb_proc_service.h b/gdb/gdb_proc_service.h
index 2c633b3e4b..0a9f26d47e 100644
--- a/gdb/gdb_proc_service.h
+++ b/gdb/gdb_proc_service.h
@@ -1,5 +1,5 @@
 /* <proc_service.h> replacement for systems that don't have it.
-   Copyright (C) 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2016 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -21,9 +21,18 @@
 
 #include <sys/types.h>
 
+#include "gregset.h"
+
 #ifdef HAVE_PROC_SERVICE_H
+
+/* glibc's proc_service.h doesn't wrap itself with extern "C".  Need
+   to do it ourselves.  */
+EXTERN_C_PUSH
+
 #include <proc_service.h>
 
+EXTERN_C_POP
+
 #else /* HAVE_PROC_SERVICE_H */
 
 /* The following fallback definitions have been imported and adjusted
@@ -53,7 +62,7 @@
 #include <sys/procfs.h>
 #endif
 
-#include "gregset.h"
+EXTERN_C_PUSH
 
 /* Functions in this interface return one of these status codes.  */
 typedef enum
@@ -115,7 +124,7 @@ extern pid_t ps_getpid (struct ps_prochandle *);
 /* Fetch the special per-thread address associated with the given LWP.
    This call is only used on a few platforms (most use a normal register).
    The meaning of the `int' parameter is machine-dependent.  */
-extern ps_err_e ps_get_thread_area (const struct ps_prochandle *,
+extern ps_err_e ps_get_thread_area (struct ps_prochandle *,
 				    lwpid_t, int, psaddr_t *);
 
 
@@ -150,6 +159,8 @@ extern ps_err_e ps_lsetxregs (struct ps_prochandle *ph, lwpid_t lwpid,
 /* Log a message (sends to gdb_stderr).  */
 extern void ps_plog (const char *fmt, ...);
 
+EXTERN_C_POP
+
 #endif /* HAVE_PROC_SERVICE_H */
 
 /* Fix-up some broken systems.  */