nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

compile fix: FD_ZERO (sys/select.h) on solaris wants to use memset(); closes #2997117

Browse source
This commit is contained in:
Mathias Gumz 2010-05-06 21:19:31 +02:00
parent 5be5edc1e5
commit 615e9cec32
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/FbTk/Timer.cc
View file

@ -36,15 +36,21 @@
#include "config.h" #include "config.h"
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
#ifdef HAVE_CASSERT #ifdef HAVE_CASSERT
#include <cassert> #include <cassert>
#else #else
#include <assert.h> #include <assert.h>
#endif #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 { namespace FbTk {
Timer::TimerList Timer::m_timerlist; Timer::TimerList Timer::m_timerlist;
@ -90,7 +96,7 @@ void Timer::start() {
if ((! m_timing || m_interval != 0) && *m_handler) { if ((! m_timing || m_interval != 0) && *m_handler) {
m_timing = true; m_timing = true;
addTimer(this); //add us to the list addTimer(this); //add us to the list
} }
} }

1
src/FbTk/Timer.hh
View file

@ -45,7 +45,6 @@
#endif // HAVE_INTTYPES_H #endif // HAVE_INTTYPES_H
#include <sys/types.h> #include <sys/types.h>
#include <sys/select.h>
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>