summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CurrentWindowCmd.cc11
-rw-r--r--src/Ewmh.cc9
-rw-r--r--src/FbTk/Shape.cc6
-rw-r--r--src/WindowState.cc11
-rw-r--r--src/WindowState.hh1
5 files changed, 37 insertions, 1 deletions
diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index 2575a39..b73de01 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -36,6 +36,17 @@
36#include "FbTk/stringstream.hh" 36#include "FbTk/stringstream.hh"
37#include "FbTk/StringUtil.hh" 37#include "FbTk/StringUtil.hh"
38 38
39#ifdef HAVE_CONFIG_H
40#include "config.h"
41#endif // HAVE_CONFIG_H
42
43#ifdef HAVE_CSTDLIB
44#include <cstdlib>
45#else
46#include <stdlib.h>
47#endif
48
49
39using FbTk::Command; 50using FbTk::Command;
40 51
41namespace { 52namespace {
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 4062595..fb1b832 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -39,15 +39,24 @@
39 39
40#include <X11/Xproto.h> 40#include <X11/Xproto.h>
41#include <X11/Xatom.h> 41#include <X11/Xatom.h>
42
42#include <iostream> 43#include <iostream>
43#include <algorithm> 44#include <algorithm>
44#include <new> 45#include <new>
46
45#ifdef HAVE_CSTRING 47#ifdef HAVE_CSTRING
46 #include <cstring> 48 #include <cstring>
47#else 49#else
48 #include <string.h> 50 #include <string.h>
49#endif 51#endif
50 52
53#ifdef HAVE_CSTDLIB
54 #include <cstdlib>
55#else
56 #include <stdlib.h>
57#endif
58
59
51using std::cerr; 60using std::cerr;
52using std::endl; 61using std::endl;
53using std::vector; 62using std::vector;
diff --git a/src/FbTk/Shape.cc b/src/FbTk/Shape.cc
index e7e2563..c952403 100644
--- a/src/FbTk/Shape.cc
+++ b/src/FbTk/Shape.cc
@@ -36,6 +36,12 @@
36 #include <string.h> 36 #include <string.h>
37#endif 37#endif
38 38
39#ifdef HAVE_CSTDLIB
40 #include <cstdlib>
41#else
42 #include <stdlib.h>
43#endif
44
39#include <X11/Xutil.h> 45#include <X11/Xutil.h>
40 46
41#ifdef SHAPE 47#ifdef SHAPE
diff --git a/src/WindowState.cc b/src/WindowState.cc
index 1b8647a..d062907 100644
--- a/src/WindowState.cc
+++ b/src/WindowState.cc
@@ -23,7 +23,16 @@
23 23
24#include "FbTk/StringUtil.hh" 24#include "FbTk/StringUtil.hh"
25 25
26#include <cstdlib> 26#ifdef HAVE_CONFIG_H
27#include "config.h"
28#endif // HAVE_CONFIG_H
29
30#ifdef HAVE_CSTDLIB
31 #include <cstdlib>
32#else
33 #include <stdlib.h>
34#endif
35
27#include <errno.h> 36#include <errno.h>
28 37
29bool WindowState::useBorder() const { 38bool WindowState::useBorder() const {
diff --git a/src/WindowState.hh b/src/WindowState.hh
index 883443a..6409d13 100644
--- a/src/WindowState.hh
+++ b/src/WindowState.hh
@@ -24,6 +24,7 @@
24 24
25#include "Layer.hh" 25#include "Layer.hh"
26 26
27#include <X11/Xlib.h>
27#include <X11/Xutil.h> 28#include <X11/Xutil.h>
28 29
29#include <string> 30#include <string>