Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-26 09:08:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename "sun" variable to avoid conflicts on Solaris

Browse Source 
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
This commit is contained in:
Christian Biesinger
2019-12-18 16:50:55 -06:00
parent 78aa740b76
commit aa989b27d0
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/fbsd-tdep.c
View File

@@ -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: