aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2010-05-06 19:19:31 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2010-05-06 19:19:31 (GMT)
commit615e9cec3223d7f4661d2b2140661839929cef5d (patch)
tree0e22ad85dc10803281fc5403c09570967e2eaea9
parent5be5edc1e5760672f11517b8b4c447346157c175 (diff)
downloadfluxbox_paul-615e9cec3223d7f4661d2b2140661839929cef5d.zip
fluxbox_paul-615e9cec3223d7f4661d2b2140661839929cef5d.tar.bz2
compile fix: FD_ZERO (sys/select.h) on solaris wants to use memset(); closes #2997117
-rw-r--r--src/FbTk/Timer.cc14
-rw-r--r--src/FbTk/Timer.hh1
2 files changed, 10 insertions, 5 deletions
diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc
index 44ea69a..7d7a84b 100644
--- a/src/FbTk/Timer.cc
+++ b/src/FbTk/Timer.cc
@@ -36,15 +36,21 @@
36#include "config.h" 36#include "config.h"
37#endif // HAVE_CONFIG_H 37#endif // HAVE_CONFIG_H
38 38
39#include <sys/time.h>
40#include <sys/types.h>
41#include <unistd.h>
42#ifdef HAVE_CASSERT 39#ifdef HAVE_CASSERT
43 #include <cassert> 40 #include <cassert>
44#else 41#else
45 #include <assert.h> 42 #include <assert.h>
46#endif 43#endif
47 44
45// sys/select.h on solaris wants to use memset()
46#ifdef HAVE_CSTRING
47# include <cstring>
48#else
49# include <string.h>
50#endif
51
52#include <sys/select.h>
53
48namespace FbTk { 54namespace FbTk {
49 55
50Timer::TimerList Timer::m_timerlist; 56Timer::TimerList Timer::m_timerlist;
@@ -90,7 +96,7 @@ void Timer::start() {
90 if ((! m_timing || m_interval != 0) && *m_handler) { 96 if ((! m_timing || m_interval != 0) && *m_handler) {
91 m_timing = true; 97 m_timing = true;
92 addTimer(this); //add us to the list 98 addTimer(this); //add us to the list
93 } 99 }
94} 100}
95 101
96 102
diff --git a/src/FbTk/Timer.hh b/src/FbTk/Timer.hh
index 4893fdb..6be269b 100644
--- a/src/FbTk/Timer.hh
+++ b/src/FbTk/Timer.hh
@@ -45,7 +45,6 @@
45#endif // HAVE_INTTYPES_H 45#endif // HAVE_INTTYPES_H
46 46
47#include <sys/types.h> 47#include <sys/types.h>
48#include <sys/select.h>
49#include <sys/time.h> 48#include <sys/time.h>
50#include <unistd.h> 49#include <unistd.h>
51 50