Patchwork Rename "sun" variable to avoid conflicts on Solaris

login
register
mail settings
Submitter Doug Evans via gdb-patches
Date Dec. 18, 2019, 10:52 p.m.
Message ID <20191218225216.7073-1-cbiesinger@google.com>
Download mbox | patch
Permalink /patch/36951/
State New
Headers show

Comments

Doug Evans via gdb-patches - Dec. 18, 2019, 10:52 p.m.
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-18  Christian Biesinger  <cbiesinger@google.com>

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

Change-Id: I07a5cd801db1e28ccab8a473ebad74d7afe017c2
---
 gdb/fbsd-tdep.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Tom Tromey - Dec. 19, 2019, 6:16 p.m.
>>>>> "Christian" == Christian Biesinger via gdb-patches <gdb-patches@sourceware.org> writes:

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

Christian> gdb/ChangeLog:

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

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

Thanks, this is ok.

Tom
Doug Evans via gdb-patches - Dec. 19, 2019, 7:03 p.m.
On Thu, Dec 19, 2019 at 12:16 PM Tom Tromey <tom@tromey.com> wrote:
>
> >>>>> "Christian" == Christian Biesinger via gdb-patches <gdb-patches@sourceware.org> writes:
>
> Christian> A Solaris system header has a #define for "sun".  This renames
> Christian> that variable to avoid the conflict, fixing a build error with
> Christian> --enable-targets=all on Solaris.
>
> Christian> gdb/ChangeLog:
>
> Christian> 2019-12-18  Christian Biesinger  <cbiesinger@google.com>
>
> Christian>      * fbsd-tdep.c (fbsd_info_proc_files_entry): Rename local var
> Christian>      "sun" to "saddr_un".
>
> Thanks, this is ok.

Thanks, pushed.

To ssh://sourceware.org/git/binutils-gdb.git
   78aa740b76..aa989b27d0  HEAD -> master

Christian

Patch

diff --git a/gdb/fbsd-tdep.c b/gdb/fbsd-tdep.c
index 937f696f44..d7482d3b58 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: