From 1b5bff96033e3ad351c83e3247f3fc0844f56a3b Mon Sep 17 00:00:00 2001 From: Braden Obrzut Date: Thu, 1 Nov 2012 18:23:39 +0000 Subject: [PATCH] - Fixed: Solaris compile. SVN r3928 (trunk) --- src/p_setup.h | 2 +- src/sdl/crashcatcher.c | 1 + src/sdl/i_system.cpp | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/p_setup.h b/src/p_setup.h index dc171e0717..b1590e7149 100644 --- a/src/p_setup.h +++ b/src/p_setup.h @@ -29,7 +29,7 @@ struct MapData { - struct + struct MapLump { char Name[8]; FileReader *Reader; diff --git a/src/sdl/crashcatcher.c b/src/sdl/crashcatcher.c index 1dfa43af83..37511f63ac 100644 --- a/src/sdl/crashcatcher.c +++ b/src/sdl/crashcatcher.c @@ -8,6 +8,7 @@ #include #include #include +#include #ifdef __linux__ #include diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index df15ce774c..afabd0d216 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -270,7 +270,14 @@ void I_HandleAlarm (int sig) void I_SelectTimer() { SEMAPHORE_INIT(timerWait, 0, 0) +#ifndef __sun signal(SIGALRM, I_HandleAlarm); +#else + struct sigaction alrmaction; + sigaction(SIGALRM, NULL, &alrmaction); + alrmaction.sa_handler = I_HandleAlarm; + sigaction(SIGALRM, &alrmaction, NULL); +#endif struct itimerval itv; itv.it_interval.tv_sec = itv.it_value.tv_sec = 0;