From b44cd86843349c24e6f85256548e3df8b0c4f8c2 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 19 Mar 2004 21:37:31 +0000
Subject: [PATCH] cleanup

---
 stepmania/src/archutils/Unix/Backtrace.cpp     | 18 +++++++++---------
 stepmania/src/archutils/Unix/Backtrace.h       |  2 +-
 .../src/archutils/Unix/LinuxThreadHelpers.cpp  |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/stepmania/src/archutils/Unix/Backtrace.cpp b/stepmania/src/archutils/Unix/Backtrace.cpp
index eabe10d74b..1b6b15a6fc 100644
--- a/stepmania/src/archutils/Unix/Backtrace.cpp
+++ b/stepmania/src/archutils/Unix/Backtrace.cpp
@@ -171,22 +171,22 @@ static void do_backtrace( const void **buf, size_t size, const BacktraceContext
 	get_readable_ranges( readable_begin, readable_end, 1024 );
 		
 	/* Find the stack memory blocks. */
-	const int stack_block1 = find_address( (void *) ctx->ebp, readable_begin, readable_end );
+	const int stack_block1 = find_address( ctx->ebp, readable_begin, readable_end );
 	const int stack_block2 = find_address( SavedStackPointer, readable_begin, readable_end );
 
 	/* This matches the layout of the stack.  The frame pointer makes the
 	 * stack a linked list. */
 	struct StackFrame
 	{
-		StackFrame *link;
-		char *return_address;
+		const StackFrame *link;
+		const void *return_address;
 	};
 
-	StackFrame *frame = (StackFrame *) ctx->ebp;
+	const StackFrame *frame = (StackFrame *) ctx->ebp;
 
 	unsigned i=0;
 	if( i < size-1 && ctx->eip ) // -1 for NULL
-		buf[i++] = (void *) ctx->eip;
+		buf[i++] = ctx->eip;
 
 	while( i < size-1 ) // -1 for NULL
 	{
@@ -213,8 +213,8 @@ static void do_backtrace( const void **buf, size_t size, const BacktraceContext
 
 void GetSignalBacktraceContext( BacktraceContext *ctx, const ucontext_t *uc )
 {
-	ctx->eip = (long) uc->uc_mcontext.gregs[REG_EIP];
-	ctx->ebp = (long) uc->uc_mcontext.gregs[REG_EBP];
+	ctx->eip = (void *) uc->uc_mcontext.gregs[REG_EIP];
+	ctx->ebp = (void *) uc->uc_mcontext.gregs[REG_EBP];
 	ctx->pid = GetCurrentThreadId();
 }
 
@@ -227,8 +227,8 @@ void GetBacktrace( const void **buf, size_t size, const BacktraceContext *ctx )
 	{
 		ctx = &CurrentCtx;
 
-		CurrentCtx.eip = 0;
-		CurrentCtx.ebp = (long) __builtin_frame_address(0);
+		CurrentCtx.eip = NULL;
+		CurrentCtx.ebp = __builtin_frame_address(0);
 		CurrentCtx.pid = GetCurrentThreadId();
 	}
 
diff --git a/stepmania/src/archutils/Unix/Backtrace.h b/stepmania/src/archutils/Unix/Backtrace.h
index b5eec71697..03624153fa 100644
--- a/stepmania/src/archutils/Unix/Backtrace.h
+++ b/stepmania/src/archutils/Unix/Backtrace.h
@@ -7,7 +7,7 @@
 struct BacktraceContext
 {
 #if defined(LINUX)
-	long eip, ebp;
+	const void *eip, *ebp;
 	pid_t pid;
 #endif
 
diff --git a/stepmania/src/archutils/Unix/LinuxThreadHelpers.cpp b/stepmania/src/archutils/Unix/LinuxThreadHelpers.cpp
index d40d6fc41d..08502e7f28 100644
--- a/stepmania/src/archutils/Unix/LinuxThreadHelpers.cpp
+++ b/stepmania/src/archutils/Unix/LinuxThreadHelpers.cpp
@@ -176,8 +176,8 @@ bool GetThreadBacktraceContext( int ThreadID, BacktraceContext *ctx )
 		return false;
 
 	ctx->pid = ThreadID;
-	ctx->eip = regs.eip;
-	ctx->ebp = regs.ebp;
+	ctx->eip = (void *) regs.eip;
+	ctx->ebp = (void *) regs.ebp;
 
 	return true;
 }