compile fix: FD_ZERO (sys/select.h) on solaris wants to use memset(); closes #2997117
This commit is contained in:
parent
5be5edc1e5
commit
615e9cec32
2 changed files with 10 additions and 5 deletions
|
@ -36,15 +36,21 @@
|
|||
#include "config.h"
|
||||
#endif // HAVE_CONFIG_H
|
||||
|
||||
#include <sys/time.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#ifdef HAVE_CASSERT
|
||||
#include <cassert>
|
||||
#else
|
||||
#include <assert.h>
|
||||
#endif
|
||||
|
||||
// sys/select.h on solaris wants to use memset()
|
||||
#ifdef HAVE_CSTRING
|
||||
# include <cstring>
|
||||
#else
|
||||
# include <string.h>
|
||||
#endif
|
||||
|
||||
#include <sys/select.h>
|
||||
|
||||
namespace FbTk {
|
||||
|
||||
Timer::TimerList Timer::m_timerlist;
|
||||
|
@ -90,7 +96,7 @@ void Timer::start() {
|
|||
if ((! m_timing || m_interval != 0) && *m_handler) {
|
||||
m_timing = true;
|
||||
addTimer(this); //add us to the list
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -45,7 +45,6 @@
|
|||
#endif // HAVE_INTTYPES_H
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/select.h>
|
||||
#include <sys/time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
|
Loading…
Reference in a new issue