diff options
author | rathnor <rathnor> | 2004-08-31 15:26:40 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2004-08-31 15:26:40 (GMT) |
commit | d17bf39a43a7581773c67d496e4022499d59cd26 (patch) | |
tree | 89e964e0e9a207d726e4ffefb88b19c51c591817 /src/FbTk | |
parent | 6a78695e6ed92f8631b84874dcb754d32fcf99d5 (diff) | |
download | fluxbox-d17bf39a43a7581773c67d496e4022499d59cd26.zip fluxbox-d17bf39a43a7581773c67d496e4022499d59cd26.tar.bz2 |
add autoconf check for std c++ headers
Diffstat (limited to 'src/FbTk')
-rw-r--r-- | src/FbTk/App.cc | 6 | ||||
-rw-r--r-- | src/FbTk/FbWindow.cc | 8 | ||||
-rw-r--r-- | src/FbTk/Font.cc | 20 | ||||
-rw-r--r-- | src/FbTk/I18n.cc | 20 | ||||
-rw-r--r-- | src/FbTk/ImageControl.cc | 20 | ||||
-rw-r--r-- | src/FbTk/Menu.cc | 20 | ||||
-rw-r--r-- | src/FbTk/MenuTheme.cc | 8 | ||||
-rw-r--r-- | src/FbTk/Resource.cc | 8 | ||||
-rw-r--r-- | src/FbTk/StringUtil.cc | 26 | ||||
-rw-r--r-- | src/FbTk/TextBox.cc | 8 | ||||
-rw-r--r-- | src/FbTk/Texture.cc | 14 | ||||
-rw-r--r-- | src/FbTk/TextureRender.cc | 8 | ||||
-rw-r--r-- | src/FbTk/Theme.cc | 8 | ||||
-rw-r--r-- | src/FbTk/ThemeItems.hh | 8 | ||||
-rw-r--r-- | src/FbTk/Timer.cc | 6 | ||||
-rw-r--r-- | src/FbTk/Timer.hh | 6 | ||||
-rw-r--r-- | src/FbTk/XFontImp.cc | 8 | ||||
-rw-r--r-- | src/FbTk/XmbFontImp.cc | 20 |
18 files changed, 175 insertions, 47 deletions
diff --git a/src/FbTk/App.cc b/src/FbTk/App.cc index 9b511e3..2479944 100644 --- a/src/FbTk/App.cc +++ b/src/FbTk/App.cc | |||
@@ -23,7 +23,11 @@ | |||
23 | 23 | ||
24 | #include "EventManager.hh" | 24 | #include "EventManager.hh" |
25 | 25 | ||
26 | #include <cassert> | 26 | #ifdef HAVE_CASSERT |
27 | #include <cassert> | ||
28 | #else | ||
29 | #include <assert.h> | ||
30 | #endif | ||
27 | #include <string> | 31 | #include <string> |
28 | 32 | ||
29 | namespace FbTk { | 33 | namespace FbTk { |
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc index 67afb68..2209835 100644 --- a/src/FbTk/FbWindow.cc +++ b/src/FbTk/FbWindow.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: FbWindow.cc,v 1.36 2004/06/15 11:03:17 fluxgen Exp $ | 22 | // $Id: FbWindow.cc,v 1.37 2004/08/31 15:26:39 rathnor Exp $ |
23 | 23 | ||
24 | #include "FbWindow.hh" | 24 | #include "FbWindow.hh" |
25 | 25 | ||
@@ -35,7 +35,11 @@ | |||
35 | #include <X11/Xutil.h> | 35 | #include <X11/Xutil.h> |
36 | #include <X11/Xatom.h> | 36 | #include <X11/Xatom.h> |
37 | 37 | ||
38 | #include <cassert> | 38 | #ifdef HAVE_CASSERT |
39 | #include <cassert> | ||
40 | #else | ||
41 | #include <assert.h> | ||
42 | #endif | ||
39 | 43 | ||
40 | namespace FbTk { | 44 | namespace FbTk { |
41 | 45 | ||
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc index 40da222..774e92a 100644 --- a/src/FbTk/Font.cc +++ b/src/FbTk/Font.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | //$Id: Font.cc,v 1.13 2004/08/28 18:10:19 rathnor Exp $ | 22 | //$Id: Font.cc,v 1.14 2004/08/31 15:26:39 rathnor Exp $ |
23 | 23 | ||
24 | 24 | ||
25 | #include "StringUtil.hh" | 25 | #include "StringUtil.hh" |
@@ -55,8 +55,16 @@ | |||
55 | #endif //__USE_GNU | 55 | #endif //__USE_GNU |
56 | 56 | ||
57 | #include <iostream> | 57 | #include <iostream> |
58 | #include <cstring> | 58 | #ifdef HAVE_CSTRING |
59 | #include <cstdlib> | 59 | #include <cstring> |
60 | #else | ||
61 | #include <string.h> | ||
62 | #endif | ||
63 | #ifdef HAVE_CSTDLIB | ||
64 | #include <cstdlib> | ||
65 | #else | ||
66 | #include <stdlib.h> | ||
67 | #endif | ||
60 | #include <list> | 68 | #include <list> |
61 | #include <typeinfo> | 69 | #include <typeinfo> |
62 | #include <langinfo.h> | 70 | #include <langinfo.h> |
@@ -71,7 +79,11 @@ | |||
71 | #error "You dont have sstream or strstream headers!" | 79 | #error "You dont have sstream or strstream headers!" |
72 | #endif // HAVE_STRSTREAM | 80 | #endif // HAVE_STRSTREAM |
73 | 81 | ||
74 | #include <cstdlib> | 82 | #ifdef HAVE_CSTDLIB |
83 | #include <cstdlib> | ||
84 | #else | ||
85 | #include <stdlib.h> | ||
86 | #endif | ||
75 | 87 | ||
76 | using namespace std; | 88 | using namespace std; |
77 | 89 | ||
diff --git a/src/FbTk/I18n.cc b/src/FbTk/I18n.cc index 64abda1..a077758 100644 --- a/src/FbTk/I18n.cc +++ b/src/FbTk/I18n.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: I18n.cc,v 1.2 2004/06/20 15:16:08 rathnor Exp $ | 25 | // $Id: I18n.cc,v 1.3 2004/08/31 15:26:39 rathnor Exp $ |
26 | 26 | ||
27 | /* Note: | 27 | /* Note: |
28 | * A good reference for the older non-gettext style I18n | 28 | * A good reference for the older non-gettext style I18n |
@@ -41,9 +41,21 @@ | |||
41 | 41 | ||
42 | #include <X11/Xlocale.h> | 42 | #include <X11/Xlocale.h> |
43 | 43 | ||
44 | #include <cstdlib> | 44 | #ifdef HAVE_CSTDLIB |
45 | #include <cstring> | 45 | #include <cstdlib> |
46 | #include <cstdio> | 46 | #else |
47 | #include <stdlib.h> | ||
48 | #endif | ||
49 | #ifdef HAVE_CSTRING | ||
50 | #include <cstring> | ||
51 | #else | ||
52 | #include <string.h> | ||
53 | #endif | ||
54 | #ifdef HAVE_CSTDIO | ||
55 | #include <cstdio> | ||
56 | #else | ||
57 | #include <stdio.h> | ||
58 | #endif | ||
47 | 59 | ||
48 | #include <iostream> | 60 | #include <iostream> |
49 | 61 | ||
diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc index 9e4f2df..b06b623 100644 --- a/src/FbTk/ImageControl.cc +++ b/src/FbTk/ImageControl.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: ImageControl.cc,v 1.13 2004/06/07 11:46:05 rathnor Exp $ | 25 | // $Id: ImageControl.cc,v 1.14 2004/08/31 15:26:39 rathnor Exp $ |
26 | 26 | ||
27 | #include "ImageControl.hh" | 27 | #include "ImageControl.hh" |
28 | 28 | ||
@@ -45,9 +45,21 @@ | |||
45 | #include <sys/types.h> | 45 | #include <sys/types.h> |
46 | #endif // HAVE_SYS_TYPES_H | 46 | #endif // HAVE_SYS_TYPES_H |
47 | 47 | ||
48 | #include <cstdlib> | 48 | #ifdef HAVE_CSTDLIB |
49 | #include <cstring> | 49 | #include <cstdlib> |
50 | #include <cstdio> | 50 | #else |
51 | #include <stdlib.h> | ||
52 | #endif | ||
53 | #ifdef HAVE_CSTRING | ||
54 | #include <cstring> | ||
55 | #else | ||
56 | #include <string.h> | ||
57 | #endif | ||
58 | #ifdef HAVE_CSTDIO | ||
59 | #include <cstdio> | ||
60 | #else | ||
61 | #include <stdio.h> | ||
62 | #endif | ||
51 | 63 | ||
52 | #ifdef HAVE_CTYPE_H | 64 | #ifdef HAVE_CTYPE_H |
53 | #include <ctype.h> | 65 | #include <ctype.h> |
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc index e03d783..b38ae73 100644 --- a/src/FbTk/Menu.cc +++ b/src/FbTk/Menu.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Menu.cc,v 1.78 2004/08/30 10:23:37 akir Exp $ | 25 | // $Id: Menu.cc,v 1.79 2004/08/31 15:26:39 rathnor Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -48,9 +48,21 @@ | |||
48 | #include <X11/Xatom.h> | 48 | #include <X11/Xatom.h> |
49 | #include <X11/keysym.h> | 49 | #include <X11/keysym.h> |
50 | 50 | ||
51 | #include <cstdio> | 51 | #ifdef HAVE_CSTDIO |
52 | #include <cstdlib> | 52 | #include <cstdio> |
53 | #include <cstring> | 53 | #else |
54 | #include <stdio.h> | ||
55 | #endif | ||
56 | #ifdef HAVE_CSTDLIB | ||
57 | #include <cstdlib> | ||
58 | #else | ||
59 | #include <stdlib.h> | ||
60 | #endif | ||
61 | #ifdef HAVE_CSTRING | ||
62 | #include <cstring> | ||
63 | #else | ||
64 | #include <string.h> | ||
65 | #endif | ||
54 | #include <iostream> | 66 | #include <iostream> |
55 | #include <typeinfo> | 67 | #include <typeinfo> |
56 | 68 | ||
diff --git a/src/FbTk/MenuTheme.cc b/src/FbTk/MenuTheme.cc index 4d04e17..9fc8959 100644 --- a/src/FbTk/MenuTheme.cc +++ b/src/FbTk/MenuTheme.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: MenuTheme.cc,v 1.19 2004/08/29 12:33:55 rathnor Exp $ | 22 | // $Id: MenuTheme.cc,v 1.20 2004/08/31 15:26:39 rathnor Exp $ |
23 | 23 | ||
24 | #include "MenuTheme.hh" | 24 | #include "MenuTheme.hh" |
25 | 25 | ||
@@ -29,7 +29,11 @@ | |||
29 | #include "App.hh" | 29 | #include "App.hh" |
30 | #include "StringUtil.hh" | 30 | #include "StringUtil.hh" |
31 | 31 | ||
32 | #include <cstdio> | 32 | #ifdef HAVE_CSTDIO |
33 | #include <cstdio> | ||
34 | #else | ||
35 | #include <stdio.h> | ||
36 | #endif | ||
33 | #include <algorithm> | 37 | #include <algorithm> |
34 | 38 | ||
35 | namespace FbTk { | 39 | namespace FbTk { |
diff --git a/src/FbTk/Resource.cc b/src/FbTk/Resource.cc index 9b89e2b..08b534d 100644 --- a/src/FbTk/Resource.cc +++ b/src/FbTk/Resource.cc | |||
@@ -19,14 +19,18 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: Resource.cc,v 1.6 2004/06/07 11:46:05 rathnor Exp $ | 22 | // $Id: Resource.cc,v 1.7 2004/08/31 15:26:39 rathnor Exp $ |
23 | 23 | ||
24 | #include "XrmDatabaseHelper.hh" | 24 | #include "XrmDatabaseHelper.hh" |
25 | #include "Resource.hh" | 25 | #include "Resource.hh" |
26 | #include "I18n.hh" | 26 | #include "I18n.hh" |
27 | 27 | ||
28 | #include <iostream> | 28 | #include <iostream> |
29 | #include <cassert> | 29 | #ifdef HAVE_CASSERT |
30 | #include <cassert> | ||
31 | #else | ||
32 | #include <assert.h> | ||
33 | #endif | ||
30 | 34 | ||
31 | using namespace std; | 35 | using namespace std; |
32 | 36 | ||
diff --git a/src/FbTk/StringUtil.cc b/src/FbTk/StringUtil.cc index 92d9eb3..92246e3 100644 --- a/src/FbTk/StringUtil.cc +++ b/src/FbTk/StringUtil.cc | |||
@@ -19,15 +19,31 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: StringUtil.cc,v 1.11 2004/05/02 20:42:56 fluxgen Exp $ | 22 | // $Id: StringUtil.cc,v 1.12 2004/08/31 15:26:39 rathnor Exp $ |
23 | 23 | ||
24 | #include "StringUtil.hh" | 24 | #include "StringUtil.hh" |
25 | 25 | ||
26 | #include <string> | 26 | #include <string> |
27 | #include <cstdio> | 27 | #ifdef HAVE_CSTDIO |
28 | #include <cstdlib> | 28 | #include <cstdio> |
29 | #include <cctype> | 29 | #else |
30 | #include <cassert> | 30 | #include <stdio.h> |
31 | #endif | ||
32 | #ifdef HAVE_CSTDLIB | ||
33 | #include <cstdlib> | ||
34 | #else | ||
35 | #include <stdlib.h> | ||
36 | #endif | ||
37 | #ifdef HAVE_CCTYPE | ||
38 | #include <cctype> | ||
39 | #else | ||
40 | #include <ctype.h> | ||
41 | #endif | ||
42 | #ifdef HAVE_CASSERT | ||
43 | #include <cassert> | ||
44 | #else | ||
45 | #include <assert.h> | ||
46 | #endif | ||
31 | #include <memory> | 47 | #include <memory> |
32 | #include <algorithm> | 48 | #include <algorithm> |
33 | 49 | ||
diff --git a/src/FbTk/TextBox.cc b/src/FbTk/TextBox.cc index a23f9a6..34671c9 100644 --- a/src/FbTk/TextBox.cc +++ b/src/FbTk/TextBox.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: TextBox.cc,v 1.11 2004/08/11 12:41:28 fluxgen Exp $ | 22 | // $Id: TextBox.cc,v 1.12 2004/08/31 15:26:39 rathnor Exp $ |
23 | 23 | ||
24 | #include "TextBox.hh" | 24 | #include "TextBox.hh" |
25 | #include "Font.hh" | 25 | #include "Font.hh" |
@@ -27,7 +27,11 @@ | |||
27 | #include "App.hh" | 27 | #include "App.hh" |
28 | #include "KeyUtil.hh" | 28 | #include "KeyUtil.hh" |
29 | 29 | ||
30 | #include <cctype> | 30 | #ifdef HAVE_CCTYPE |
31 | #include <cctype> | ||
32 | #else | ||
33 | #include <ctype.h> | ||
34 | #endif | ||
31 | #include <X11/keysym.h> | 35 | #include <X11/keysym.h> |
32 | #include <X11/Xutil.h> | 36 | #include <X11/Xutil.h> |
33 | 37 | ||
diff --git a/src/FbTk/Texture.cc b/src/FbTk/Texture.cc index dbf9cf5..812f76a 100644 --- a/src/FbTk/Texture.cc +++ b/src/FbTk/Texture.cc | |||
@@ -22,14 +22,22 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Texture.cc,v 1.9 2004/08/26 16:37:48 rathnor Exp $ | 25 | // $Id: Texture.cc,v 1.10 2004/08/31 15:26:39 rathnor Exp $ |
26 | 26 | ||
27 | #include "App.hh" | 27 | #include "App.hh" |
28 | #include "Texture.hh" | 28 | #include "Texture.hh" |
29 | 29 | ||
30 | #include <X11/Xlib.h> | 30 | #include <X11/Xlib.h> |
31 | #include <cstring> | 31 | #ifdef HAVE_CSTRING |
32 | #include <cctype> | 32 | #include <cstring> |
33 | #else | ||
34 | #include <string.h> | ||
35 | #endif | ||
36 | #ifdef HAVE_CCTYPE | ||
37 | #include <cctype> | ||
38 | #else | ||
39 | #include <ctype.h> | ||
40 | #endif | ||
33 | 41 | ||
34 | namespace FbTk { | 42 | namespace FbTk { |
35 | 43 | ||
diff --git a/src/FbTk/TextureRender.cc b/src/FbTk/TextureRender.cc index 04fb2b3..dc51d35 100644 --- a/src/FbTk/TextureRender.cc +++ b/src/FbTk/TextureRender.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: TextureRender.cc,v 1.10 2004/07/05 23:51:57 fluxgen Exp $ | 25 | // $Id: TextureRender.cc,v 1.11 2004/08/31 15:26:39 rathnor Exp $ |
26 | 26 | ||
27 | #include "TextureRender.hh" | 27 | #include "TextureRender.hh" |
28 | 28 | ||
@@ -34,7 +34,11 @@ | |||
34 | 34 | ||
35 | #include <iostream> | 35 | #include <iostream> |
36 | #include <string> | 36 | #include <string> |
37 | #include <cstdio> | 37 | #ifdef HAVE_CSTDIO |
38 | #include <cstdio> | ||
39 | #else | ||
40 | #include <stdio.h> | ||
41 | #endif | ||
38 | using namespace std; | 42 | using namespace std; |
39 | 43 | ||
40 | namespace FbTk { | 44 | namespace FbTk { |
diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc index e557d29..f3b4530 100644 --- a/src/FbTk/Theme.cc +++ b/src/FbTk/Theme.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: Theme.cc,v 1.28 2004/08/26 18:26:39 akir Exp $ | 22 | // $Id: Theme.cc,v 1.29 2004/08/31 15:26:39 rathnor Exp $ |
23 | 23 | ||
24 | #include "Theme.hh" | 24 | #include "Theme.hh" |
25 | 25 | ||
@@ -30,7 +30,11 @@ | |||
30 | #include "Directory.hh" | 30 | #include "Directory.hh" |
31 | #include "I18n.hh" | 31 | #include "I18n.hh" |
32 | 32 | ||
33 | #include <cstdio> | 33 | #ifdef HAVE_CSTDIO |
34 | #include <cstdio> | ||
35 | #else | ||
36 | #include <stdio.h> | ||
37 | #endif | ||
34 | #include <memory> | 38 | #include <memory> |
35 | #include <iostream> | 39 | #include <iostream> |
36 | 40 | ||
diff --git a/src/FbTk/ThemeItems.hh b/src/FbTk/ThemeItems.hh index f17cba6..259ccc7 100644 --- a/src/FbTk/ThemeItems.hh +++ b/src/FbTk/ThemeItems.hh | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: ThemeItems.hh,v 1.7 2004/08/26 16:37:48 rathnor Exp $ | 22 | // $Id: ThemeItems.hh,v 1.8 2004/08/31 15:26:39 rathnor Exp $ |
23 | 23 | ||
24 | /// @file implements common theme items | 24 | /// @file implements common theme items |
25 | 25 | ||
@@ -34,7 +34,11 @@ | |||
34 | #include "Image.hh" | 34 | #include "Image.hh" |
35 | 35 | ||
36 | #include <string> | 36 | #include <string> |
37 | #include <cstdio> | 37 | #ifdef HAVE_CSTDIO |
38 | #include <cstdio> | ||
39 | #else | ||
40 | #include <stdio.h> | ||
41 | #endif | ||
38 | #include <iostream> | 42 | #include <iostream> |
39 | namespace FbTk { | 43 | namespace FbTk { |
40 | 44 | ||
diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc index efecc5e..9ac0824 100644 --- a/src/FbTk/Timer.cc +++ b/src/FbTk/Timer.cc | |||
@@ -38,7 +38,11 @@ | |||
38 | #include <sys/time.h> | 38 | #include <sys/time.h> |
39 | #include <sys/types.h> | 39 | #include <sys/types.h> |
40 | #include <unistd.h> | 40 | #include <unistd.h> |
41 | #include <cassert> | 41 | #ifdef HAVE_CASSERT |
42 | #include <cassert> | ||
43 | #else | ||
44 | #include <assert.h> | ||
45 | #endif | ||
42 | 46 | ||
43 | namespace FbTk { | 47 | namespace FbTk { |
44 | 48 | ||
diff --git a/src/FbTk/Timer.hh b/src/FbTk/Timer.hh index eb6f02a..b337b24 100644 --- a/src/FbTk/Timer.hh +++ b/src/FbTk/Timer.hh | |||
@@ -27,7 +27,11 @@ | |||
27 | 27 | ||
28 | #include "RefCount.hh" | 28 | #include "RefCount.hh" |
29 | 29 | ||
30 | #include <ctime> | 30 | #ifdef HAVE_CTIME |
31 | #include <ctime> | ||
32 | #else | ||
33 | #include <time.h> | ||
34 | #endif | ||
31 | #include <list> | 35 | #include <list> |
32 | 36 | ||
33 | #ifdef HAVE_CONFIG_H | 37 | #ifdef HAVE_CONFIG_H |
diff --git a/src/FbTk/XFontImp.cc b/src/FbTk/XFontImp.cc index 195730d..0818634 100644 --- a/src/FbTk/XFontImp.cc +++ b/src/FbTk/XFontImp.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: XFontImp.cc,v 1.8 2004/08/10 11:58:22 fluxgen Exp $ | 22 | // $Id: XFontImp.cc,v 1.9 2004/08/31 15:26:39 rathnor Exp $ |
23 | 23 | ||
24 | #include "XFontImp.hh" | 24 | #include "XFontImp.hh" |
25 | #include "App.hh" | 25 | #include "App.hh" |
@@ -31,7 +31,11 @@ | |||
31 | 31 | ||
32 | #include <iostream> | 32 | #include <iostream> |
33 | #include <new> | 33 | #include <new> |
34 | #include <cstdio> | 34 | #ifdef HAVE_CSTDIO |
35 | #include <cstdio> | ||
36 | #else | ||
37 | #include <stdio.h> | ||
38 | #endif | ||
35 | using namespace std; | 39 | using namespace std; |
36 | 40 | ||
37 | namespace FbTk { | 41 | namespace FbTk { |
diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc index b6f8941..7afe37c 100644 --- a/src/FbTk/XmbFontImp.cc +++ b/src/FbTk/XmbFontImp.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: XmbFontImp.cc,v 1.9 2004/08/28 18:10:19 rathnor Exp $ | 22 | // $Id: XmbFontImp.cc,v 1.10 2004/08/31 15:26:39 rathnor Exp $ |
23 | 23 | ||
24 | #include "XmbFontImp.hh" | 24 | #include "XmbFontImp.hh" |
25 | 25 | ||
@@ -38,10 +38,22 @@ | |||
38 | #define _GNU_SOURCE | 38 | #define _GNU_SOURCE |
39 | #endif // _GNU_SOURCE | 39 | #endif // _GNU_SOURCE |
40 | 40 | ||
41 | #include <cstdio> | 41 | #ifdef HAVE_CSTDIO |
42 | #include <cstdarg> | 42 | #include <cstdio> |
43 | #else | ||
44 | #include <stdio.h> | ||
45 | #endif | ||
46 | #ifdef HAVE_CSTDARG | ||
47 | #include <cstdarg> | ||
48 | #else | ||
49 | #include <stdarg.h> | ||
50 | #endif | ||
43 | #include <iostream> | 51 | #include <iostream> |
44 | #include <cstring> | 52 | #ifdef HAVE_CSTRING |
53 | #include <cstring> | ||
54 | #else | ||
55 | #include <string.h> | ||
56 | #endif | ||
45 | 57 | ||
46 | using namespace std; | 58 | using namespace std; |
47 | 59 | ||