From aa989b27d0bad451455416953c0e5026e229863a Mon Sep 17 00:00:00 2001 From: Christian Biesinger Date: Wed, 18 Dec 2019 16:50:55 -0600 Subject: [PATCH] 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 * fbsd-tdep.c (fbsd_info_proc_files_entry): Rename local var "sun" to "saddr_un". Change-Id: I07a5cd801db1e28ccab8a473ebad74d7afe017c2 --- gdb/ChangeLog | 5 +++++ gdb/fbsd-tdep.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index aad9c632bbd..e0da79eda81 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-12-19 Christian Biesinger + + * fbsd-tdep.c (fbsd_info_proc_files_entry): Rename local var + "sun" to "saddr_un". + 2019-12-19 Tom Tromey * ui-out.h (enum class field_kind): Fix comment. diff --git a/gdb/fbsd-tdep.c b/gdb/fbsd-tdep.c index 937f696f44c..d7482d3b581 100644 --- 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 (kf_sa_local); - if (sun->sun_path[0] == 0) - sun = reinterpret_cast + if (saddr_un->sun_path[0] == 0) + saddr_un = reinterpret_cast (kf_sa_peer); - printf_filtered ("%s", sun->sun_path); + printf_filtered ("%s", saddr_un->sun_path); break; } case FBSD_AF_INET: -- 2.30.2