aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
authormarkt <markt>2007-06-29 17:33:28 (GMT)
committermarkt <markt>2007-06-29 17:33:28 (GMT)
commit424c113f236b5b5635aa023bf9758463fbef44d0 (patch)
tree538fa32fe957237fb05df87fcbf124a9d87f6910 /src/FbTk
parent4def8fad56d9503b5388678dbd721e4b7ed5c254 (diff)
downloadfluxbox-424c113f236b5b5635aa023bf9758463fbef44d0.zip
fluxbox-424c113f236b5b5635aa023bf9758463fbef44d0.tar.bz2
updates for compiling with gcc 4.3
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/FbPixmap.cc5
-rw-r--r--src/FbTk/FbString.cc10
-rw-r--r--src/FbTk/KeyUtil.cc5
-rw-r--r--src/FbTk/Menu.cc3
-rw-r--r--src/FbTk/StringUtil.cc5
-rw-r--r--src/FbTk/TextBox.cc10
-rw-r--r--src/FbTk/TextureRender.cc5
-rw-r--r--src/FbTk/ThemeItems.cc10
-rw-r--r--src/FbTk/XFontImp.cc8
9 files changed, 61 insertions, 0 deletions
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
34using std::cerr; 39using 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
29namespace { 34namespace {
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>
72using std::cout; 75using 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
40using std::cerr; 48using std::cerr;
41using std::endl; 49using std::endl;