From 07c6998820cd11bb97306ed64c49481cd5769854 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Thu, 12 Jan 2006 09:36:02 +0000 Subject: [PATCH] Fix. AC_CHECK_DECLS always defines HAVE_DECL_*. --- stepmania/src/archutils/Darwin/arch_setup.h | 4 +++- stepmania/src/archutils/Unix/CrashHandler.cpp | 4 ++-- stepmania/src/archutils/Unix/SignalHandler.cpp | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/stepmania/src/archutils/Darwin/arch_setup.h b/stepmania/src/archutils/Darwin/arch_setup.h index 6fb3c94d0e..aaae5fb470 100644 --- a/stepmania/src/archutils/Darwin/arch_setup.h +++ b/stepmania/src/archutils/Darwin/arch_setup.h @@ -22,7 +22,9 @@ typedef unsigned long long UInt64; #define HAVE_FFMPEG #define HAVE_SDL #define HAVE_PTHREAD_COND_TIMEDWAIT -#define HAVE_DECL_SIGUSR1 +/* This must be defined to 1 because autoconf's AC_CHECK_DECLS macro decides to define + * this in all cases. If only they could be consistent... */ +#define HAVE_DECL_SIGUSR1 1 /* We have which gets pulled in when we use gcc 4.0's * but no . The definitions of LITTLE_ENDIAN, BIG_ENDIAN and end up conflicting diff --git a/stepmania/src/archutils/Unix/CrashHandler.cpp b/stepmania/src/archutils/Unix/CrashHandler.cpp index ad8282839a..6a296fd8ac 100644 --- a/stepmania/src/archutils/Unix/CrashHandler.cpp +++ b/stepmania/src/archutils/Unix/CrashHandler.cpp @@ -238,10 +238,10 @@ const char *SignalName( int signo ) X(SIGQUIT) case SIGSEGV: return "Segmentation fault"; X(SIGTRAP) X(SIGTERM) X(SIGVTALRM) X(SIGXCPU) X(SIGXFSZ) -#if defined(HAVE_DECL_SIGPWR) +#if defined(HAVE_DECL_SIGPWR) && HAVE_DECL_SIGPWR X(SIGPWR) #endif -#if defined(HAVE_DECL_SIGUSR1) +#if defined(HAVE_DECL_SIGUSR1) && HAVE_DECL_SIGUSR1 case SIGUSR1: return "Forced crash"; #endif default: diff --git a/stepmania/src/archutils/Unix/SignalHandler.cpp b/stepmania/src/archutils/Unix/SignalHandler.cpp index 0495d3722d..1f9c28b2d0 100644 --- a/stepmania/src/archutils/Unix/SignalHandler.cpp +++ b/stepmania/src/archutils/Unix/SignalHandler.cpp @@ -33,10 +33,10 @@ static int signals[] = { SIGALRM, SIGBUS, SIGFPE, SIGHUP, SIGILL, SIGINT, SIGABRT, SIGQUIT, SIGSEGV, SIGTRAP, SIGTERM, SIGVTALRM, SIGXCPU, SIGXFSZ, -#if defined(HAVE_DECL_SIGPWR) +#if defined(HAVE_DECL_SIGPWR) && HAVE_DECL_SIGPWR SIGPWR, #endif -#if defined(HAVE_DECL_SIGUSR1) +#if defined(HAVE_DECL_SIGUSR1) && HAVE_DECL_SIGUSR1 SIGUSR1, #endif -1