Fix. AC_CHECK_DECLS always defines HAVE_DECL_*.
This commit is contained in:
@@ -22,7 +22,9 @@ typedef unsigned long long UInt64;
|
|||||||
#define HAVE_FFMPEG
|
#define HAVE_FFMPEG
|
||||||
#define HAVE_SDL
|
#define HAVE_SDL
|
||||||
#define HAVE_PTHREAD_COND_TIMEDWAIT
|
#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 <machine/endian.h> which gets pulled in when we use gcc 4.0's <cstdlib>
|
/* We have <machine/endian.h> which gets pulled in when we use gcc 4.0's <cstdlib>
|
||||||
* but no <endian.h>. The definitions of LITTLE_ENDIAN, BIG_ENDIAN and end up conflicting
|
* but no <endian.h>. The definitions of LITTLE_ENDIAN, BIG_ENDIAN and end up conflicting
|
||||||
|
|||||||
@@ -238,10 +238,10 @@ const char *SignalName( int signo )
|
|||||||
X(SIGQUIT)
|
X(SIGQUIT)
|
||||||
case SIGSEGV: return "Segmentation fault";
|
case SIGSEGV: return "Segmentation fault";
|
||||||
X(SIGTRAP) X(SIGTERM) X(SIGVTALRM) X(SIGXCPU) X(SIGXFSZ)
|
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)
|
X(SIGPWR)
|
||||||
#endif
|
#endif
|
||||||
#if defined(HAVE_DECL_SIGUSR1)
|
#if defined(HAVE_DECL_SIGUSR1) && HAVE_DECL_SIGUSR1
|
||||||
case SIGUSR1: return "Forced crash";
|
case SIGUSR1: return "Forced crash";
|
||||||
#endif
|
#endif
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -33,10 +33,10 @@ static int signals[] =
|
|||||||
{
|
{
|
||||||
SIGALRM, SIGBUS, SIGFPE, SIGHUP, SIGILL, SIGINT, SIGABRT,
|
SIGALRM, SIGBUS, SIGFPE, SIGHUP, SIGILL, SIGINT, SIGABRT,
|
||||||
SIGQUIT, SIGSEGV, SIGTRAP, SIGTERM, SIGVTALRM, SIGXCPU, SIGXFSZ,
|
SIGQUIT, SIGSEGV, SIGTRAP, SIGTERM, SIGVTALRM, SIGXCPU, SIGXFSZ,
|
||||||
#if defined(HAVE_DECL_SIGPWR)
|
#if defined(HAVE_DECL_SIGPWR) && HAVE_DECL_SIGPWR
|
||||||
SIGPWR,
|
SIGPWR,
|
||||||
#endif
|
#endif
|
||||||
#if defined(HAVE_DECL_SIGUSR1)
|
#if defined(HAVE_DECL_SIGUSR1) && HAVE_DECL_SIGUSR1
|
||||||
SIGUSR1,
|
SIGUSR1,
|
||||||
#endif
|
#endif
|
||||||
-1
|
-1
|
||||||
|
|||||||
Reference in New Issue
Block a user