diff options
-rw-r--r-- | src/Ewmh.cc | 5 | ||||
-rw-r--r-- | src/FbCommands.cc | 5 | ||||
-rw-r--r-- | src/FbTk/FbPixmap.cc | 5 | ||||
-rw-r--r-- | src/FbTk/FbString.cc | 10 | ||||
-rw-r--r-- | src/FbTk/KeyUtil.cc | 5 | ||||
-rw-r--r-- | src/FbTk/Menu.cc | 3 | ||||
-rw-r--r-- | src/FbTk/StringUtil.cc | 5 | ||||
-rw-r--r-- | src/FbTk/TextBox.cc | 10 | ||||
-rw-r--r-- | src/FbTk/TextureRender.cc | 5 | ||||
-rw-r--r-- | src/FbTk/ThemeItems.cc | 10 | ||||
-rw-r--r-- | src/FbTk/XFontImp.cc | 8 | ||||
-rw-r--r-- | src/FocusControl.cc | 5 | ||||
-rw-r--r-- | src/Gnome.cc | 5 | ||||
-rw-r--r-- | src/IconbarTool.cc | 5 | ||||
-rw-r--r-- | src/Remember.cc | 5 | ||||
-rw-r--r-- | src/Resources.cc | 5 | ||||
-rw-r--r-- | src/RootTheme.cc | 5 | ||||
-rw-r--r-- | src/Screen.cc | 5 | ||||
-rw-r--r-- | src/ScreenPlacement.cc | 5 | ||||
-rw-r--r-- | src/ScreenResources.cc | 5 | ||||
-rw-r--r-- | src/Slit.cc | 5 | ||||
-rw-r--r-- | src/WinClient.cc | 5 | ||||
-rw-r--r-- | src/Xutil.cc | 5 | ||||
-rw-r--r-- | util/fbrun/main.cc | 10 |
24 files changed, 141 insertions, 0 deletions
diff --git a/src/Ewmh.cc b/src/Ewmh.cc index 5a6bdfa..f8d3598 100644 --- a/src/Ewmh.cc +++ b/src/Ewmh.cc | |||
@@ -41,6 +41,11 @@ | |||
41 | #include <iostream> | 41 | #include <iostream> |
42 | #include <algorithm> | 42 | #include <algorithm> |
43 | #include <new> | 43 | #include <new> |
44 | #ifdef HAVE_CSTRING | ||
45 | #include <cstring> | ||
46 | #else | ||
47 | #include <string.h> | ||
48 | #endif | ||
44 | 49 | ||
45 | using std::cerr; | 50 | using std::cerr; |
46 | using std::endl; | 51 | using std::endl; |
diff --git a/src/FbCommands.cc b/src/FbCommands.cc index 8266bce..b6d8ebc 100644 --- a/src/FbCommands.cc +++ b/src/FbCommands.cc | |||
@@ -46,6 +46,11 @@ | |||
46 | #else | 46 | #else |
47 | #include <stdlib.h> | 47 | #include <stdlib.h> |
48 | #endif | 48 | #endif |
49 | #ifdef HAVE_CSTRING | ||
50 | #include <cstring> | ||
51 | #else | ||
52 | #include <string.h> | ||
53 | #endif | ||
49 | 54 | ||
50 | 55 | ||
51 | #ifdef HAVE_CONFIG_H | 56 | #ifdef HAVE_CONFIG_H |
diff --git a/src/FbTk/FbPixmap.cc b/src/FbTk/FbPixmap.cc index 14d05e7..43ba1a1 100644 --- a/src/FbTk/FbPixmap.cc +++ b/src/FbTk/FbPixmap.cc | |||
@@ -30,6 +30,11 @@ | |||
30 | #include <X11/Xutil.h> | 30 | #include <X11/Xutil.h> |
31 | #include <X11/Xatom.h> | 31 | #include <X11/Xatom.h> |
32 | #include <iostream> | 32 | #include <iostream> |
33 | #ifdef HAVE_CSTRING | ||
34 | #include <cstring> | ||
35 | #else | ||
36 | #include <string.h> | ||
37 | #endif | ||
33 | 38 | ||
34 | using std::cerr; | 39 | using std::cerr; |
35 | 40 | ||
diff --git a/src/FbTk/FbString.cc b/src/FbTk/FbString.cc index 6614ec4..7ee1b5f 100644 --- a/src/FbTk/FbString.cc +++ b/src/FbTk/FbString.cc | |||
@@ -27,6 +27,16 @@ | |||
27 | #else | 27 | #else |
28 | #include <errno.h> | 28 | #include <errno.h> |
29 | #endif | 29 | #endif |
30 | #ifdef HAVE_CSTRING | ||
31 | #include <cstring> | ||
32 | #else | ||
33 | #include <string.h> | ||
34 | #endif | ||
35 | #ifdef HAVE_CSTDLIB | ||
36 | #include <cstdlib> | ||
37 | #else | ||
38 | #include <stdlib.h> | ||
39 | #endif | ||
30 | 40 | ||
31 | #include "FbString.hh" | 41 | #include "FbString.hh" |
32 | #include "config.h" | 42 | #include "config.h" |
diff --git a/src/FbTk/KeyUtil.cc b/src/FbTk/KeyUtil.cc index abf91fe..1830dca 100644 --- a/src/FbTk/KeyUtil.cc +++ b/src/FbTk/KeyUtil.cc | |||
@@ -25,6 +25,11 @@ | |||
25 | #include "App.hh" | 25 | #include "App.hh" |
26 | 26 | ||
27 | #include <string> | 27 | #include <string> |
28 | #ifdef HAVE_CSTRING | ||
29 | #include <cstring> | ||
30 | #else | ||
31 | #include <string.h> | ||
32 | #endif | ||
28 | 33 | ||
29 | namespace { | 34 | namespace { |
30 | 35 | ||
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc index 7b259eb..cf735d6 100644 --- a/src/FbTk/Menu.cc +++ b/src/FbTk/Menu.cc | |||
@@ -67,6 +67,9 @@ | |||
67 | #endif | 67 | #endif |
68 | #include <typeinfo> | 68 | #include <typeinfo> |
69 | 69 | ||
70 | #include <algorithm> | ||
71 | |||
72 | |||
70 | #ifdef DEBUG | 73 | #ifdef DEBUG |
71 | #include <iostream> | 74 | #include <iostream> |
72 | using std::cout; | 75 | using std::cout; |
diff --git a/src/FbTk/StringUtil.cc b/src/FbTk/StringUtil.cc index 11bd87d..869a3b5 100644 --- a/src/FbTk/StringUtil.cc +++ b/src/FbTk/StringUtil.cc | |||
@@ -44,6 +44,11 @@ | |||
44 | #else | 44 | #else |
45 | #include <assert.h> | 45 | #include <assert.h> |
46 | #endif | 46 | #endif |
47 | #ifdef HAVE_CSTRING | ||
48 | #include <cstring> | ||
49 | #else | ||
50 | #include <string.h> | ||
51 | #endif | ||
47 | 52 | ||
48 | 53 | ||
49 | #include <memory> | 54 | #include <memory> |
diff --git a/src/FbTk/TextBox.cc b/src/FbTk/TextBox.cc index 19c44dc..fa1600e 100644 --- a/src/FbTk/TextBox.cc +++ b/src/FbTk/TextBox.cc | |||
@@ -32,6 +32,16 @@ | |||
32 | #else | 32 | #else |
33 | #include <ctype.h> | 33 | #include <ctype.h> |
34 | #endif | 34 | #endif |
35 | #ifdef HAVE_CSTRING | ||
36 | #include <cstring> | ||
37 | #else | ||
38 | #include <string.h> | ||
39 | #endif | ||
40 | #ifdef HAVE_CSTDLIB | ||
41 | #include <cstdlib> | ||
42 | #else | ||
43 | #include <stdlib.h> | ||
44 | #endif | ||
35 | #include <X11/keysym.h> | 45 | #include <X11/keysym.h> |
36 | #include <X11/Xutil.h> | 46 | #include <X11/Xutil.h> |
37 | 47 | ||
diff --git a/src/FbTk/TextureRender.cc b/src/FbTk/TextureRender.cc index e5271dc..5d9c7d5 100644 --- a/src/FbTk/TextureRender.cc +++ b/src/FbTk/TextureRender.cc | |||
@@ -39,6 +39,11 @@ | |||
39 | #else | 39 | #else |
40 | #include <stdio.h> | 40 | #include <stdio.h> |
41 | #endif | 41 | #endif |
42 | #ifdef HAVE_CSTRING | ||
43 | #include <cstring> | ||
44 | #else | ||
45 | #include <string.h> | ||
46 | #endif | ||
42 | 47 | ||
43 | // mipspro has no new(nothrow) | 48 | // mipspro has no new(nothrow) |
44 | #if defined sgi && ! defined GCC | 49 | #if defined sgi && ! defined GCC |
diff --git a/src/FbTk/ThemeItems.cc b/src/FbTk/ThemeItems.cc index 6d2b244..db314a3 100644 --- a/src/FbTk/ThemeItems.cc +++ b/src/FbTk/ThemeItems.cc | |||
@@ -45,6 +45,16 @@ | |||
45 | #else | 45 | #else |
46 | #include <stdio.h> | 46 | #include <stdio.h> |
47 | #endif | 47 | #endif |
48 | #ifdef HAVE_CSTRING | ||
49 | #include <cstring> | ||
50 | #else | ||
51 | #include <string.h> | ||
52 | #endif | ||
53 | #ifdef HAVE_CSTDLIB | ||
54 | #include <cstdlib> | ||
55 | #else | ||
56 | #include <stdlib.h> | ||
57 | #endif | ||
48 | 58 | ||
49 | #include <iostream> | 59 | #include <iostream> |
50 | #include <memory> | 60 | #include <memory> |
diff --git a/src/FbTk/XFontImp.cc b/src/FbTk/XFontImp.cc index 0c404a1..1c97b35 100644 --- a/src/FbTk/XFontImp.cc +++ b/src/FbTk/XFontImp.cc | |||
@@ -36,6 +36,14 @@ | |||
36 | #else | 36 | #else |
37 | #include <stdio.h> | 37 | #include <stdio.h> |
38 | #endif | 38 | #endif |
39 | #ifdef HAVE_CSTRING | ||
40 | #include <cstring> | ||
41 | #else | ||
42 | #include <string.h> | ||
43 | #endif | ||
44 | |||
45 | #include <algorithm> | ||
46 | |||
39 | 47 | ||
40 | using std::cerr; | 48 | using std::cerr; |
41 | using std::endl; | 49 | using std::endl; |
diff --git a/src/FocusControl.cc b/src/FocusControl.cc index 126f8b1..8706752 100644 --- a/src/FocusControl.cc +++ b/src/FocusControl.cc | |||
@@ -35,6 +35,11 @@ | |||
35 | 35 | ||
36 | #include <string> | 36 | #include <string> |
37 | #include <iostream> | 37 | #include <iostream> |
38 | #ifdef HAVE_CSTRING | ||
39 | #include <cstring> | ||
40 | #else | ||
41 | #include <string.h> | ||
42 | #endif | ||
38 | 43 | ||
39 | using std::cerr; | 44 | using std::cerr; |
40 | using std::endl; | 45 | using std::endl; |
diff --git a/src/Gnome.cc b/src/Gnome.cc index 92b7b51..c401f1b 100644 --- a/src/Gnome.cc +++ b/src/Gnome.cc | |||
@@ -33,6 +33,11 @@ | |||
33 | 33 | ||
34 | #include <iostream> | 34 | #include <iostream> |
35 | #include <new> | 35 | #include <new> |
36 | #ifdef HAVE_CSTRING | ||
37 | #include <cstring> | ||
38 | #else | ||
39 | #include <string.h> | ||
40 | #endif | ||
36 | 41 | ||
37 | using std::cerr; | 42 | using std::cerr; |
38 | using std::endl; | 43 | using std::endl; |
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc index df7990d..bbd867b 100644 --- a/src/IconbarTool.cc +++ b/src/IconbarTool.cc | |||
@@ -51,6 +51,11 @@ | |||
51 | #include <typeinfo> | 51 | #include <typeinfo> |
52 | #include <string> | 52 | #include <string> |
53 | #include <iterator> | 53 | #include <iterator> |
54 | #ifdef HAVE_CSTRING | ||
55 | #include <cstring> | ||
56 | #else | ||
57 | #include <string.h> | ||
58 | #endif | ||
54 | 59 | ||
55 | using std::string; | 60 | using std::string; |
56 | using std::list; | 61 | using std::list; |
diff --git a/src/Remember.cc b/src/Remember.cc index 329e999..2a94c6a 100644 --- a/src/Remember.cc +++ b/src/Remember.cc | |||
@@ -44,6 +44,11 @@ | |||
44 | 44 | ||
45 | 45 | ||
46 | #include <X11/Xlib.h> | 46 | #include <X11/Xlib.h> |
47 | #ifdef HAVE_CSTRING | ||
48 | #include <cstring> | ||
49 | #else | ||
50 | #include <string.h> | ||
51 | #endif | ||
47 | 52 | ||
48 | //use GNU extensions | 53 | //use GNU extensions |
49 | #ifndef _GNU_SOURCE | 54 | #ifndef _GNU_SOURCE |
diff --git a/src/Resources.cc b/src/Resources.cc index 92833b5..d8660eb 100644 --- a/src/Resources.cc +++ b/src/Resources.cc | |||
@@ -35,6 +35,11 @@ | |||
35 | #include <stdio.h> | 35 | #include <stdio.h> |
36 | #include <string> | 36 | #include <string> |
37 | #include <vector> | 37 | #include <vector> |
38 | #ifdef HAVE_CSTRING | ||
39 | #include <cstring> | ||
40 | #else | ||
41 | #include <string.h> | ||
42 | #endif | ||
38 | 43 | ||
39 | using std::string; | 44 | using std::string; |
40 | using std::vector; | 45 | using std::vector; |
diff --git a/src/RootTheme.cc b/src/RootTheme.cc index 4e5c9fe..5189fbb 100644 --- a/src/RootTheme.cc +++ b/src/RootTheme.cc | |||
@@ -41,6 +41,11 @@ | |||
41 | 41 | ||
42 | #include <sys/types.h> | 42 | #include <sys/types.h> |
43 | #include <sys/wait.h> | 43 | #include <sys/wait.h> |
44 | #ifdef HAVE_CSTRING | ||
45 | #include <cstring> | ||
46 | #else | ||
47 | #include <string.h> | ||
48 | #endif | ||
44 | 49 | ||
45 | using std::cerr; | 50 | using std::cerr; |
46 | using std::endl; | 51 | using std::endl; |
diff --git a/src/Screen.cc b/src/Screen.cc index dbf2ce6..d71b076 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -135,6 +135,11 @@ extern "C" { | |||
135 | #include <algorithm> | 135 | #include <algorithm> |
136 | #include <functional> | 136 | #include <functional> |
137 | #include <stack> | 137 | #include <stack> |
138 | #ifdef HAVE_CSTRING | ||
139 | #include <cstring> | ||
140 | #else | ||
141 | #include <string.h> | ||
142 | #endif | ||
138 | 143 | ||
139 | using std::cerr; | 144 | using std::cerr; |
140 | using std::endl; | 145 | using std::endl; |
diff --git a/src/ScreenPlacement.cc b/src/ScreenPlacement.cc index 85f2487..d614488 100644 --- a/src/ScreenPlacement.cc +++ b/src/ScreenPlacement.cc | |||
@@ -35,6 +35,11 @@ | |||
35 | 35 | ||
36 | #include <iostream> | 36 | #include <iostream> |
37 | #include <exception> | 37 | #include <exception> |
38 | #ifdef HAVE_CSTRING | ||
39 | #include <cstring> | ||
40 | #else | ||
41 | #include <string.h> | ||
42 | #endif | ||
38 | using std::cerr; | 43 | using std::cerr; |
39 | using std::endl; | 44 | using std::endl; |
40 | 45 | ||
diff --git a/src/ScreenResources.cc b/src/ScreenResources.cc index 8b71505..e4d712a 100644 --- a/src/ScreenResources.cc +++ b/src/ScreenResources.cc | |||
@@ -27,6 +27,11 @@ | |||
27 | 27 | ||
28 | #include "Screen.hh" | 28 | #include "Screen.hh" |
29 | #include <string> | 29 | #include <string> |
30 | #ifdef HAVE_CSTRING | ||
31 | #include <cstring> | ||
32 | #else | ||
33 | #include <string.h> | ||
34 | #endif | ||
30 | 35 | ||
31 | using std::string; | 36 | using std::string; |
32 | 37 | ||
diff --git a/src/Slit.cc b/src/Slit.cc index f5f1158..118179b 100644 --- a/src/Slit.cc +++ b/src/Slit.cc | |||
@@ -75,6 +75,11 @@ | |||
75 | 75 | ||
76 | #include <iostream> | 76 | #include <iostream> |
77 | #include <algorithm> | 77 | #include <algorithm> |
78 | #ifdef HAVE_CSTRING | ||
79 | #include <cstring> | ||
80 | #else | ||
81 | #include <string.h> | ||
82 | #endif | ||
78 | 83 | ||
79 | using std::string; | 84 | using std::string; |
80 | using std::pair; | 85 | using std::pair; |
diff --git a/src/WinClient.cc b/src/WinClient.cc index ab9d967..3f048d0 100644 --- a/src/WinClient.cc +++ b/src/WinClient.cc | |||
@@ -44,6 +44,11 @@ | |||
44 | #else | 44 | #else |
45 | #include <assert.h> | 45 | #include <assert.h> |
46 | #endif | 46 | #endif |
47 | #ifdef HAVE_CSTRING | ||
48 | #include <cstring> | ||
49 | #else | ||
50 | #include <string.h> | ||
51 | #endif | ||
47 | 52 | ||
48 | using std::string; | 53 | using std::string; |
49 | using std::list; | 54 | using std::list; |
diff --git a/src/Xutil.cc b/src/Xutil.cc index 4d4dbc2..6a12071 100644 --- a/src/Xutil.cc +++ b/src/Xutil.cc | |||
@@ -32,6 +32,11 @@ | |||
32 | #include <X11/Xatom.h> | 32 | #include <X11/Xatom.h> |
33 | #include <X11/Xlib.h> | 33 | #include <X11/Xlib.h> |
34 | #include <iostream> | 34 | #include <iostream> |
35 | #ifdef HAVE_CSTRING | ||
36 | #include <cstring> | ||
37 | #else | ||
38 | #include <string.h> | ||
39 | #endif | ||
35 | 40 | ||
36 | using std::string; | 41 | using std::string; |
37 | 42 | ||
diff --git a/util/fbrun/main.cc b/util/fbrun/main.cc index e5d3e2f..86003ab 100644 --- a/util/fbrun/main.cc +++ b/util/fbrun/main.cc | |||
@@ -34,6 +34,16 @@ extern "C" { | |||
34 | 34 | ||
35 | #include <string> | 35 | #include <string> |
36 | #include <iostream> | 36 | #include <iostream> |
37 | #ifdef HAVE_CSTRING | ||
38 | #include <cstring> | ||
39 | #else | ||
40 | #include <string.h> | ||
41 | #endif | ||
42 | #ifdef HAVE_CSTDLIB | ||
43 | #include <cstdlib> | ||
44 | #else | ||
45 | #include <stdlib.h> | ||
46 | #endif | ||
37 | 47 | ||
38 | using std::cerr; | 48 | using std::cerr; |
39 | using std::endl; | 49 | using std::endl; |