Rename "sun" variable to avoid conflicts on Solaris

A Solaris system header has a #define for "sun".  This renames
that variable to avoid the conflict, fixing a build error with
--enable-targets=all on Solaris.

gdb/ChangeLog:

2019-12-19  Christian Biesinger  <cbiesinger@google.com>

	* fbsd-tdep.c (fbsd_info_proc_files_entry): Rename local var
	"sun" to "saddr_un".

Change-Id: I07a5cd801db1e28ccab8a473ebad74d7afe017c2

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aad9c632bbdea6090f6e514e14f8af0722f4b1a0..e0da79eda815c77c67e9afca7492d3e8bbae76c0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-19  Christian Biesinger  <cbiesinger@google.com>
+
+       * fbsd-tdep.c (fbsd_info_proc_files_entry): Rename local var
+       "sun" to "saddr_un".
+
 2019-12-19  Tom Tromey  <tromey@adacore.com>
 
        * ui-out.h (enum class field_kind): Fix comment.

diff --git a/gdb/fbsd-tdep.c b/gdb/fbsd-tdep.c
index 937f696f44cb36be39f4b11e70fa34295c96a025..d7482d3b581f3931e2a0d511fef29bbfc0db9668 100644 (file)
--- a/gdb/fbsd-tdep.c
+++ b/gdb/fbsd-tdep.c
@@ -1018,12 +1018,12 @@ fbsd_info_proc_files_entry (int kf_type, int kf_fd, int kf_flags,
 
            /* For local sockets, print out the first non-nul path
               rather than both paths.  */
-           const struct fbsd_sockaddr_un *sun
+           const struct fbsd_sockaddr_un *saddr_un
              = reinterpret_cast<const struct fbsd_sockaddr_un *> (kf_sa_local);
-           if (sun->sun_path[0] == 0)
-             sun = reinterpret_cast<const struct fbsd_sockaddr_un *>
+           if (saddr_un->sun_path[0] == 0)
+             saddr_un = reinterpret_cast<const struct fbsd_sockaddr_un *>
                (kf_sa_peer);
-           printf_filtered ("%s", sun->sun_path);
+           printf_filtered ("%s", saddr_un->sun_path);
            break;
          }
        case FBSD_AF_INET: