Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed compilation when there's no sigwaitinfo #665

Merged
merged 1 commit into from
Oct 27, 2015
Merged

Fixed compilation when there's no sigwaitinfo #665

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/rrd_daemon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,16 +335,16 @@ static void sig_common (const char *sig) /* {{{ */

static void* signal_receiver (void UNUSED(*args))
{
siginfo_t signal_info;
int status;

while (1)
{
#if defined(HAVE_SIGWAITINFO)
siginfo_t signal_info;
status = sigwaitinfo(&signal_set, &signal_info);
#elif defined(HAVE_SIGWAIT)
status = -1;
if (sigwait(signal_set, &status) < 0 ){
if (sigwait(&signal_set, &status) < 0 ){
status = -1;
}
#else
Expand Down Expand Up @@ -408,11 +408,18 @@ static void* signal_receiver (void UNUSED(*args))
break;

default:
#if defined(HAVE_SIGWAITINFO)
RRDD_LOG(LOG_NOTICE,
"%s: Signal %d was received from process %u.\n",
__func__,
status,
signal_info.si_pid);
#else
RRDD_LOG(LOG_NOTICE,
"%s: Signal %d was received.\n",
__func__,
status);
#endif
}
}

Expand Down