Rename "sun" variable to avoid conflicts on Solaris

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

diff --git a/gdb/fbsd-nat.h b/gdb/fbsd-nat.h
index 3e34600e15d901da2ac694289ed64c2dccc17ab4..b0c9eb16c7754f6b2353838b837d4a9671dfc373 100644 (file)
--- a/gdb/fbsd-nat.h
+++ b/gdb/fbsd-nat.h
@@ -1,6 +1,6 @@
 /* Native-dependent code for FreeBSD.
 
-   Copyright (C) 2004-2018 Free Software Foundation, Inc.
+   Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -21,6 +21,7 @@
 #define FBSD_NAT_H
 
 #include "inf-ptrace.h"
+#include <sys/proc.h>
 
 #ifdef TRAP_BRKPT
 /* MIPS does not set si_code for SIGTRAP.  sparc64 reports
@@ -41,18 +42,16 @@ public:
 
   bool info_proc (const char *, enum info_proc_what) override;
 
-#ifdef KERN_PROC_AUXV
   enum target_xfer_status xfer_partial (enum target_object object,
                                        const char *annex,
                                        gdb_byte *readbuf,
                                        const gdb_byte *writebuf,
                                        ULONGEST offset, ULONGEST len,
                                        ULONGEST *xfered_len) override;
-#endif
 
 #ifdef PT_LWPINFO
   bool thread_alive (ptid_t ptid) override;
-  const char *pid_to_str (ptid_t) override;
+  std::string pid_to_str (ptid_t) override;
 
 #ifdef HAVE_STRUCT_PTRACE_LWPINFO_PL_TDNAME
   const char *thread_name (struct thread_info *) override;