vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings with sig_atomic_t being a long on FreeBSD.

This commit is contained in:
Guillaume Friloux 2014-05-30 14:02:36 +02:00
parent f92e5d50f9
commit 6d320cac20
1 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/lib/ecore/ecore_signal.c
View File

@ -163,8 +163,13 @@ _ecore_signal_call(void)
#endif #endif
sigprocmask(SIG_BLOCK, &newset, &oldset); sigprocmask(SIG_BLOCK, &newset, &oldset);
if (sigchld_count > MAXSIGQ) if (sigchld_count > MAXSIGQ)
#ifdef __FreeBSD__
WRN("%ld SIGCHLD in queue. max queue size %i. losing "
"siginfo for extra signals.", sigchld_count, MAXSIGQ);
#else
WRN("%i SIGCHLD in queue. max queue size %i. losing " WRN("%i SIGCHLD in queue. max queue size %i. losing "
"siginfo for extra signals.", sigchld_count, MAXSIGQ); "siginfo for extra signals.", sigchld_count, MAXSIGQ);
#endif
tot = sigchld_count + sigusr1_count + sigusr2_count + tot = sigchld_count + sigusr1_count + sigusr2_count +
sighup_count + sigquit_count + sigint_count + sigterm_count sighup_count + sigquit_count + sigint_count + sigterm_count
#ifdef SIGPWR #ifdef SIGPWR
@ -174,7 +179,11 @@ _ecore_signal_call(void)
if (sig_count != tot) if (sig_count != tot)
{ {
#ifdef __FreeBSD__
ERR("sig_count (%ld) != actual totals (%i) ", sig_count, tot);
#else
ERR("sig_count (%i) != actual totals (%i) ", sig_count, tot); ERR("sig_count (%i) != actual totals (%i) ", sig_count, tot);
#endif
sig_count = tot; sig_count = tot;
} }
@ -255,8 +264,13 @@ _ecore_signal_call(void)
sigchld_count = 0; sigchld_count = 0;
if (sigusr1_count > MAXSIGQ) if (sigusr1_count > MAXSIGQ)
#ifdef __FreeBSD__
WRN("%ld SIGUSR1 in queue. max queue size %i. losing "
"siginfo for extra signals.", sigusr1_count, MAXSIGQ);
#else
WRN("%i SIGUSR1 in queue. max queue size %i. losing " WRN("%i SIGUSR1 in queue. max queue size %i. losing "
"siginfo for extra signals.", sigusr1_count, MAXSIGQ); "siginfo for extra signals.", sigusr1_count, MAXSIGQ);
#endif
for (n = 0; n < sigusr1_count; n++) for (n = 0; n < sigusr1_count; n++)
{ {
Ecore_Event_Signal_User *e; Ecore_Event_Signal_User *e;
@ -277,8 +291,13 @@ _ecore_signal_call(void)
sigusr1_count = 0; sigusr1_count = 0;
if (sigusr2_count > MAXSIGQ) if (sigusr2_count > MAXSIGQ)
#ifdef __FreeBSD__
WRN("%ld SIGUSR2 in queue. max queue size %i. losing "
"siginfo for extra signals.", sigusr2_count, MAXSIGQ);
#else
WRN("%i SIGUSR2 in queue. max queue size %i. losing " WRN("%i SIGUSR2 in queue. max queue size %i. losing "
"siginfo for extra signals.", sigusr2_count, MAXSIGQ); "siginfo for extra signals.", sigusr2_count, MAXSIGQ);
#endif
for (n = 0; n < sigusr2_count; n++) for (n = 0; n < sigusr2_count; n++)
{ {
Ecore_Event_Signal_User *e; Ecore_Event_Signal_User *e;
@ -299,8 +318,13 @@ _ecore_signal_call(void)
sigusr2_count = 0; sigusr2_count = 0;
if (sighup_count > MAXSIGQ) if (sighup_count > MAXSIGQ)
#ifdef __FreeBSD__
WRN("%ld SIGHUP in queue. max queue size %i. losing "
"siginfo for extra signals.", sighup_count, MAXSIGQ);
#else
WRN("%i SIGHUP in queue. max queue size %i. losing " WRN("%i SIGHUP in queue. max queue size %i. losing "
"siginfo for extra signals.", sighup_count, MAXSIGQ); "siginfo for extra signals.", sighup_count, MAXSIGQ);
#endif
for (n = 0; n < sighup_count; n++) for (n = 0; n < sighup_count; n++)
{ {
Ecore_Event_Signal_Hup *e; Ecore_Event_Signal_Hup *e;
@ -319,8 +343,13 @@ _ecore_signal_call(void)
sighup_count = 0; sighup_count = 0;
if (sigquit_count > MAXSIGQ) if (sigquit_count > MAXSIGQ)
#ifdef __FreeBSD__
WRN("%ld SIGQUIT in queue. max queue size %i. losing "
"siginfo for extra signals.", sigquit_count, MAXSIGQ);
#else
WRN("%i SIGQUIT in queue. max queue size %i. losing " WRN("%i SIGQUIT in queue. max queue size %i. losing "
"siginfo for extra signals.", sigquit_count, MAXSIGQ); "siginfo for extra signals.", sigquit_count, MAXSIGQ);
#endif
for (n = 0; n < sigquit_count; n++) for (n = 0; n < sigquit_count; n++)
{ {
Ecore_Event_Signal_Exit *e; Ecore_Event_Signal_Exit *e;
@ -341,8 +370,13 @@ _ecore_signal_call(void)
sigquit_count = 0; sigquit_count = 0;
if (sigint_count > MAXSIGQ) if (sigint_count > MAXSIGQ)
#ifdef __FreeBSD__
WRN("%ld SIGINT in queue. max queue size %i. losing "
"siginfo for extra signals.", sigint_count, MAXSIGQ);
#else
WRN("%i SIGINT in queue. max queue size %i. losing " WRN("%i SIGINT in queue. max queue size %i. losing "
"siginfo for extra signals.", sigint_count, MAXSIGQ); "siginfo for extra signals.", sigint_count, MAXSIGQ);
#endif
for (n = 0; n < sigint_count; n++) for (n = 0; n < sigint_count; n++)
{ {
Ecore_Event_Signal_Exit *e; Ecore_Event_Signal_Exit *e;
@ -363,8 +397,13 @@ _ecore_signal_call(void)
sigint_count = 0; sigint_count = 0;
if (sigterm_count > MAXSIGQ) if (sigterm_count > MAXSIGQ)
#ifdef __FreeBSD__
WRN("%ld SIGTERM in queue. max queue size %i. losing "
"siginfo for extra signals.", sigterm_count, MAXSIGQ);
#else
WRN("%i SIGTERM in queue. max queue size %i. losing " WRN("%i SIGTERM in queue. max queue size %i. losing "
"siginfo for extra signals.", sigterm_count, MAXSIGQ); "siginfo for extra signals.", sigterm_count, MAXSIGQ);
#endif
for (n = 0; n < sigterm_count; n++) for (n = 0; n < sigterm_count; n++)
{ {
Ecore_Event_Signal_Exit *e; Ecore_Event_Signal_Exit *e;
@ -386,8 +425,13 @@ _ecore_signal_call(void)
#ifdef SIGPWR #ifdef SIGPWR
if (sigpwr_count > MAXSIGQ) if (sigpwr_count > MAXSIGQ)
#ifdef __FreeBSD__
WRN("%ld SIGPWR in queue. max queue size %i. losing "
"siginfo for extra signals.", sigpwr_count, MAXSIGQ);
#else
WRN("%i SIGPWR in queue. max queue size %i. losing " WRN("%i SIGPWR in queue. max queue size %i. losing "
"siginfo for extra signals.", sigpwr_count, MAXSIGQ); "siginfo for extra signals.", sigpwr_count, MAXSIGQ);
#endif
for (n = 0; n < sigpwr_count; n++) for (n = 0; n < sigpwr_count; n++)
{ {
Ecore_Event_Signal_Power *e; Ecore_Event_Signal_Power *e;