diff options
| author | Christian Biesinger <cbiesinger@google.com> | 2019-12-18 16:50:55 -0600 |
|---|---|---|
| committer | Christian Biesinger <cbiesinger@google.com> | 2019-12-19 13:02:39 -0600 |
| commit | aa989b27d0bad451455416953c0e5026e229863a (patch) | |
| tree | e7783207a424029f46dbb1ec99862e24c3542bbf /gdb | |
| parent | 78aa740b768e1e62f8bf9d216901245c452a31d9 (diff) | |
| download | gdb-aa989b27d0bad451455416953c0e5026e229863a.zip gdb-aa989b27d0bad451455416953c0e5026e229863a.tar.gz gdb-aa989b27d0bad451455416953c0e5026e229863a.tar.bz2 | |
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
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/fbsd-tdep.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index aad9c63..e0da79e 100644 --- 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 937f696..d7482d3 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<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: |