diff options
author | Bernhard Walle <Bernhard.Walle@gmx.de> | 2008-03-25 19:31:47 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2008-03-25 19:59:52 (GMT) |
commit | d300c62ba090a3bfac65a2c8dcc7add1b4cf45b4 (patch) | |
tree | 83da0066b698e085d4a63f2a288d0041af4a8d3d | |
parent | 173682f8dec2f2255b89c6412c634dcbe60a6b99 (diff) | |
download | fluxbox_pavel-d300c62ba090a3bfac65a2c8dcc7add1b4cf45b4.zip fluxbox_pavel-d300c62ba090a3bfac65a2c8dcc7add1b4cf45b4.tar.bz2 |
Fix build with g++ 4.3
This change fixes the build for g++ 4.3. Build verified on openSUSE Factory.
Only missing includes and using directives are added.
-rw-r--r-- | src/FocusableList.cc | 6 | ||||
-rw-r--r-- | src/FocusableList.hh | 1 | ||||
-rw-r--r-- | src/Layer.hh | 6 | ||||
-rw-r--r-- | src/Xutil.cc | 7 | ||||
-rw-r--r-- | util/fluxbox-update_configs.cc | 3 |
5 files changed, 23 insertions, 0 deletions
diff --git a/src/FocusableList.cc b/src/FocusableList.cc index 258a43b..70f415e 100644 --- a/src/FocusableList.cc +++ b/src/FocusableList.cc | |||
@@ -31,6 +31,12 @@ | |||
31 | 31 | ||
32 | #include <vector> | 32 | #include <vector> |
33 | 33 | ||
34 | #ifdef HAVE_CSTRING | ||
35 | #include <cstring> | ||
36 | #else | ||
37 | #include <string.h> | ||
38 | #endif | ||
39 | |||
34 | using std::string; | 40 | using std::string; |
35 | using std::vector; | 41 | using std::vector; |
36 | 42 | ||
diff --git a/src/FocusableList.hh b/src/FocusableList.hh index 91eb6a4..d46fe48 100644 --- a/src/FocusableList.hh +++ b/src/FocusableList.hh | |||
@@ -30,6 +30,7 @@ | |||
30 | 30 | ||
31 | #include <list> | 31 | #include <list> |
32 | #include <string> | 32 | #include <string> |
33 | #include <memory> | ||
33 | 34 | ||
34 | class BScreen; | 35 | class BScreen; |
35 | class Focusable; | 36 | class Focusable; |
diff --git a/src/Layer.hh b/src/Layer.hh index bbda950..58fb5b6 100644 --- a/src/Layer.hh +++ b/src/Layer.hh | |||
@@ -25,6 +25,12 @@ | |||
25 | #include <string> | 25 | #include <string> |
26 | #include <cstdio> | 26 | #include <cstdio> |
27 | 27 | ||
28 | #ifdef HAVE_CSTRING | ||
29 | #include <cstring> | ||
30 | #else | ||
31 | #include <string.h> | ||
32 | #endif | ||
33 | |||
28 | using std::string; | 34 | using std::string; |
29 | 35 | ||
30 | /** | 36 | /** |
diff --git a/src/Xutil.cc b/src/Xutil.cc index 44fceaf..a1744c4 100644 --- a/src/Xutil.cc +++ b/src/Xutil.cc | |||
@@ -29,7 +29,14 @@ | |||
29 | #include <X11/Xatom.h> | 29 | #include <X11/Xatom.h> |
30 | #include <iostream> | 30 | #include <iostream> |
31 | 31 | ||
32 | #ifdef HAVE_CSTRING | ||
33 | #include <cstring> | ||
34 | #else | ||
35 | #include <string.h> | ||
36 | #endif | ||
37 | |||
32 | using std::string; | 38 | using std::string; |
39 | using std::strlen; | ||
33 | 40 | ||
34 | #ifdef DEBUG | 41 | #ifdef DEBUG |
35 | using std::cerr; | 42 | using std::cerr; |
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc index 75be474..eb080de 100644 --- a/util/fluxbox-update_configs.cc +++ b/util/fluxbox-update_configs.cc | |||
@@ -48,6 +48,7 @@ | |||
48 | #include <fstream> | 48 | #include <fstream> |
49 | #include <set> | 49 | #include <set> |
50 | #include <map> | 50 | #include <map> |
51 | #include <cstdlib> | ||
51 | #include <list> | 52 | #include <list> |
52 | 53 | ||
53 | using std::cout; | 54 | using std::cout; |
@@ -59,6 +60,8 @@ using std::ofstream; | |||
59 | using std::set; | 60 | using std::set; |
60 | using std::map; | 61 | using std::map; |
61 | using std::list; | 62 | using std::list; |
63 | using std::exit; | ||
64 | using std::getenv; | ||
62 | 65 | ||
63 | string read_file(string filename); | 66 | string read_file(string filename); |
64 | void write_file(string filename, string &contents); | 67 | void write_file(string filename, string &contents); |