From 1e5b735bcdba523d3049921636d0bb29c30abb6e Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Sat, 2 Aug 2003 12:51:25 +0000
Subject: [PATCH] Use HAVE_VERSION_INFO so that multiple archs can take
 advantage of a build number and date

---
 stepmania/src/RageLog.cpp                          |  4 ++--
 stepmania/src/archutils/Darwin/arch_setup.h        |  1 +
 stepmania/src/archutils/Unix/CrashHandler.cpp      |  2 ++
 stepmania/src/archutils/Unix/CrashHandlerChild.cpp | 11 +++++++++--
 stepmania/src/archutils/Win32/arch_setup.h         |  3 +++
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp
index 53839967c0..08d97dd416 100644
--- a/stepmania/src/RageLog.cpp
+++ b/stepmania/src/RageLog.cpp
@@ -66,7 +66,7 @@ map<CString, CString> LogMaps;
 #define LOG_PATH BASE_PATH "log.txt"
 #define INFO_PATH BASE_PATH "info.txt"
 
-#if defined(_WINDOWS)
+#if defined(HAVE_VERSION_INFO)
 extern unsigned long version_num;
 extern const char *version_time;
 #endif
@@ -103,7 +103,7 @@ RageLog::RageLog()
 	this->Trace( "Log starting %.4d-%.2d-%.2d %.2d:%.2d:%.2d", 
 		1900+now->tm_year, now->tm_mon, now->tm_mday, now->tm_hour, now->tm_min, now->tm_sec );
 	this->Trace( "" );
-#if defined(_WINDOWS)
+#if defined(HAVE_VERSION_INFO)
 	this->Info("Compiled %s (build %i)", version_time, version_num);
 #endif
 }
diff --git a/stepmania/src/archutils/Darwin/arch_setup.h b/stepmania/src/archutils/Darwin/arch_setup.h
index 82f0b1468e..989aa1f6b5 100644
--- a/stepmania/src/archutils/Darwin/arch_setup.h
+++ b/stepmania/src/archutils/Darwin/arch_setup.h
@@ -8,3 +8,4 @@
 #define NEED_ACOSF
 #define BACKTRACE_LOOKUP_METHOD_ATOS
 #define BACKTRACE_METHOD_POWERPC_DARWIN
+#define HAVE_VERSION_INFO
diff --git a/stepmania/src/archutils/Unix/CrashHandler.cpp b/stepmania/src/archutils/Unix/CrashHandler.cpp
index d58f972860..0746776406 100644
--- a/stepmania/src/archutils/Unix/CrashHandler.cpp
+++ b/stepmania/src/archutils/Unix/CrashHandler.cpp
@@ -383,9 +383,11 @@ static void do_backtrace(void **buf, size_t size)
 
 void CrashSignalHandler( int signal )
 {
+#if !defined(BACKTRACE_METHOD_POWERPC_DARWIN)
 	/* Don't dump a debug file if the user just hit ^C. */
 	if( signal == SIGINT || signal == SIGTERM )
 		return;
+#endif
 
 	static bool received = false;
 
diff --git a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
index f45fcfd49a..4a27718df2 100644
--- a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
+++ b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
@@ -22,6 +22,10 @@
 #include "archutils/Darwin/Crash.h"
 #endif
 
+#if defined(HAVE_VERSION_INFO)
+extern const unsigned version_num;
+#endif
+
 struct BacktraceNames
 {
     CString Symbol, File;
@@ -339,8 +343,11 @@ static void child_process()
         exit(1);
     }
 
-    fprintf(CrashDump, "StepMania crash report\n");
-    fprintf(CrashDump, "--------------------------------------\n");
+    fprintf(CrashDump, "StepMania crash report");
+#if defined(HAVE_VERSION_INFO)
+    fprintf(CrashDump, " -- build %u", version_num);
+#endif
+    fprintf(CrashDump, "\n--------------------------------------\n");
     fprintf(CrashDump, "\n");
 
     CString Signal;
diff --git a/stepmania/src/archutils/Win32/arch_setup.h b/stepmania/src/archutils/Win32/arch_setup.h
index 51d992198a..e9c452d06f 100644
--- a/stepmania/src/archutils/Win32/arch_setup.h
+++ b/stepmania/src/archutils/Win32/arch_setup.h
@@ -40,5 +40,8 @@
 #define NEED_TRUNCF
 #define NEED_ROUNDF
 
+/* For RageLog */
+#define HAVE_VERSION_INFO
+
 #endif