diff mbox

[1/2] Cast the pointer assigned to ss_sp to char *.

Message ID 8e120e99ac187140f4b9f4ad2a4e3613fe765095.1461101705.git.jhb@FreeBSD.org
State New
Headers show

Commit Message

John Baldwin April 19, 2016, 9:40 p.m. UTC
FreeBSD versions older than 11.0 use char * as the type of ss_sp in
stack_t instead of the standards-defined void *.  C++ allows a char *
pointer to be converted to a void *, so it is safe to cast the return
value of xmalloc to char * if ss_sp is either a char * or void *.
Just always use the cast to char * since that is less ugly than having
to add a special case.

gdb/ChangeLog:

	* main.c (setup_alternate_signal_stack): Cast to char *.
---
 gdb/ChangeLog | 4 ++++
 gdb/main.c    | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

Comments

Pedro Alves April 19, 2016, 10:38 p.m. UTC | #1
Perfect, thanks.
diff mbox

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9e65878..6f681b9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@ 
+2016-04-19  John Baldwin  <jhb@FreeBSD.org>
+
+	* main.c (setup_alternate_signal_stack): Cast to char *.
+
 2016-04-19  Doug Evans  <xdje42@gmail.com>
 
 	* source.c (is_regular_file): New arg errno_ptr.
diff --git a/gdb/main.c b/gdb/main.c
index c149b70..2ce1713 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -297,7 +297,9 @@  setup_alternate_signal_stack (void)
 #ifdef HAVE_SIGALTSTACK
   stack_t ss;
 
-  ss.ss_sp = xmalloc (SIGSTKSZ);
+  /* FreeBSD versions older than 11.0 use char * for ss_sp instead of
+     void *.  This cast works with both types.  */
+  ss.ss_sp = (char *) xmalloc (SIGSTKSZ);
   ss.ss_size = SIGSTKSZ;
   ss.ss_flags = 0;