From d17bf39a43a7581773c67d496e4022499d59cd26 Mon Sep 17 00:00:00 2001 From: rathnor Date: Tue, 31 Aug 2004 15:26:40 +0000 Subject: add autoconf check for std c++ headers --- ChangeLog | 3 +++ configure.in | 2 ++ src/ClientPattern.cc | 8 ++++++-- src/ClockTool.cc | 8 ++++++-- src/FbAtoms.cc | 8 ++++++-- src/FbTk/App.cc | 6 +++++- src/FbTk/FbWindow.cc | 8 ++++++-- src/FbTk/Font.cc | 20 ++++++++++++++++---- src/FbTk/I18n.cc | 20 ++++++++++++++++---- src/FbTk/ImageControl.cc | 20 ++++++++++++++++---- src/FbTk/Menu.cc | 20 ++++++++++++++++---- src/FbTk/MenuTheme.cc | 8 ++++++-- src/FbTk/Resource.cc | 8 ++++++-- src/FbTk/StringUtil.cc | 26 +++++++++++++++++++++----- src/FbTk/TextBox.cc | 8 ++++++-- src/FbTk/Texture.cc | 14 +++++++++++--- src/FbTk/TextureRender.cc | 8 ++++++-- src/FbTk/Theme.cc | 8 ++++++-- src/FbTk/ThemeItems.hh | 8 ++++++-- src/FbTk/Timer.cc | 6 +++++- src/FbTk/Timer.hh | 6 +++++- src/FbTk/XFontImp.cc | 8 ++++++-- src/FbTk/XmbFontImp.cc | 20 ++++++++++++++++---- src/IntResMenuItem.cc | 8 ++++++-- src/Keys.cc | 32 ++++++++++++++++++++++++++------ src/Screen.hh | 8 ++++++-- src/Shape.cc | 8 ++++++-- src/Slit.cc | 8 ++++++-- src/Toolbar.cc | 8 ++++++-- src/WinClient.cc | 8 ++++++-- src/Window.cc | 20 ++++++++++++++++---- src/Workspace.cc | 14 +++++++++++--- src/WorkspaceCmd.cc | 8 ++++++-- src/fluxbox.cc | 20 ++++++++++++++++---- src/fluxbox.hh | 8 ++++++-- src/main.cc | 20 ++++++++++++++++---- src/tests/Resourcetest.cc | 6 +++++- src/tests/signaltest.cc | 6 +++++- util/bsetroot.cc | 20 ++++++++++++++++---- util/fbrun/FbRun.cc | 8 ++++++-- 40 files changed, 363 insertions(+), 98 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78d4e0f..b6e6496 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ (Format: Year/Month/Day) Changes for 0.9.10: +*04/08/31: + * Check for C++ std headers, some older machines dont have them (Simon) + configure.in src/.hh/cc *04/08/30: * Changed session.screen.iconbar.clientWidth to session.screen.iconbar.iconWidth diff --git a/configure.in b/configure.in index 26ab1fc..79209f5 100644 --- a/configure.in +++ b/configure.in @@ -33,6 +33,8 @@ AC_CHECK_HEADERS(sstream, , )] ) +AC_CHECK_HEADERS(cassert cctype cerrno cmath cstdarg cstdio cstdlib cstring ctime) + AC_HEADER_TIME dnl Check for existance of basename(), setlocale() and strftime() diff --git a/src/ClientPattern.cc b/src/ClientPattern.cc index 2fba185..c175c64 100644 --- a/src/ClientPattern.cc +++ b/src/ClientPattern.cc @@ -20,7 +20,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: ClientPattern.cc,v 1.7 2004/04/28 13:04:06 rathnor Exp $ +// $Id: ClientPattern.cc,v 1.8 2004/08/31 15:26:38 rathnor Exp $ #include "ClientPattern.hh" #include "RegExp.hh" @@ -38,7 +38,11 @@ #include #include #include -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif // needed as well for index on some systems (e.g. solaris) #include diff --git a/src/ClockTool.cc b/src/ClockTool.cc index 2364a5b..dbc128f 100644 --- a/src/ClockTool.cc +++ b/src/ClockTool.cc @@ -20,7 +20,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: ClockTool.cc,v 1.13 2004/08/29 08:33:12 rathnor Exp $ +// $Id: ClockTool.cc,v 1.14 2004/08/31 15:26:38 rathnor Exp $ #include "ClockTool.hh" @@ -39,7 +39,11 @@ #include "config.h" #endif // HAVE_CONFIG_H -#include +#ifdef HAVE_CTIME + #include +#else + #include +#endif #include #include using namespace std; diff --git a/src/FbAtoms.cc b/src/FbAtoms.cc index de8a9a8..8b2bfb2 100644 --- a/src/FbAtoms.cc +++ b/src/FbAtoms.cc @@ -19,13 +19,17 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: FbAtoms.cc,v 1.9 2003/09/24 14:02:25 rathnor Exp $ +// $Id: FbAtoms.cc,v 1.10 2004/08/31 15:26:38 rathnor Exp $ #include "FbAtoms.hh" #include "App.hh" #include -#include +#ifdef HAVE_CASSERT + #include +#else + #include +#endif using namespace std; 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 @@ #include "EventManager.hh" -#include +#ifdef HAVE_CASSERT + #include +#else + #include +#endif #include 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: FbWindow.cc,v 1.36 2004/06/15 11:03:17 fluxgen Exp $ +// $Id: FbWindow.cc,v 1.37 2004/08/31 15:26:39 rathnor Exp $ #include "FbWindow.hh" @@ -35,7 +35,11 @@ #include #include -#include +#ifdef HAVE_CASSERT + #include +#else + #include +#endif namespace FbTk { 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -//$Id: Font.cc,v 1.13 2004/08/28 18:10:19 rathnor Exp $ +//$Id: Font.cc,v 1.14 2004/08/31 15:26:39 rathnor Exp $ #include "StringUtil.hh" @@ -55,8 +55,16 @@ #endif //__USE_GNU #include -#include -#include +#ifdef HAVE_CSTRING + #include +#else + #include +#endif +#ifdef HAVE_CSTDLIB + #include +#else + #include +#endif #include #include #include @@ -71,7 +79,11 @@ #error "You dont have sstream or strstream headers!" #endif // HAVE_STRSTREAM -#include +#ifdef HAVE_CSTDLIB + #include +#else + #include +#endif using namespace std; 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: I18n.cc,v 1.2 2004/06/20 15:16:08 rathnor Exp $ +// $Id: I18n.cc,v 1.3 2004/08/31 15:26:39 rathnor Exp $ /* Note: * A good reference for the older non-gettext style I18n @@ -41,9 +41,21 @@ #include -#include -#include -#include +#ifdef HAVE_CSTDLIB + #include +#else + #include +#endif +#ifdef HAVE_CSTRING + #include +#else + #include +#endif +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif #include 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: ImageControl.cc,v 1.13 2004/06/07 11:46:05 rathnor Exp $ +// $Id: ImageControl.cc,v 1.14 2004/08/31 15:26:39 rathnor Exp $ #include "ImageControl.hh" @@ -45,9 +45,21 @@ #include #endif // HAVE_SYS_TYPES_H -#include -#include -#include +#ifdef HAVE_CSTDLIB + #include +#else + #include +#endif +#ifdef HAVE_CSTRING + #include +#else + #include +#endif +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif #ifdef HAVE_CTYPE_H #include 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Menu.cc,v 1.78 2004/08/30 10:23:37 akir Exp $ +// $Id: Menu.cc,v 1.79 2004/08/31 15:26:39 rathnor Exp $ //use GNU extensions #ifndef _GNU_SOURCE @@ -48,9 +48,21 @@ #include #include -#include -#include -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif +#ifdef HAVE_CSTDLIB + #include +#else + #include +#endif +#ifdef HAVE_CSTRING + #include +#else + #include +#endif #include #include 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: MenuTheme.cc,v 1.19 2004/08/29 12:33:55 rathnor Exp $ +// $Id: MenuTheme.cc,v 1.20 2004/08/31 15:26:39 rathnor Exp $ #include "MenuTheme.hh" @@ -29,7 +29,11 @@ #include "App.hh" #include "StringUtil.hh" -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif #include 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Resource.cc,v 1.6 2004/06/07 11:46:05 rathnor Exp $ +// $Id: Resource.cc,v 1.7 2004/08/31 15:26:39 rathnor Exp $ #include "XrmDatabaseHelper.hh" #include "Resource.hh" #include "I18n.hh" #include -#include +#ifdef HAVE_CASSERT + #include +#else + #include +#endif using namespace std; 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: StringUtil.cc,v 1.11 2004/05/02 20:42:56 fluxgen Exp $ +// $Id: StringUtil.cc,v 1.12 2004/08/31 15:26:39 rathnor Exp $ #include "StringUtil.hh" #include -#include -#include -#include -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif +#ifdef HAVE_CSTDLIB + #include +#else + #include +#endif +#ifdef HAVE_CCTYPE + #include +#else + #include +#endif +#ifdef HAVE_CASSERT + #include +#else + #include +#endif #include #include 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: TextBox.cc,v 1.11 2004/08/11 12:41:28 fluxgen Exp $ +// $Id: TextBox.cc,v 1.12 2004/08/31 15:26:39 rathnor Exp $ #include "TextBox.hh" #include "Font.hh" @@ -27,7 +27,11 @@ #include "App.hh" #include "KeyUtil.hh" -#include +#ifdef HAVE_CCTYPE + #include +#else + #include +#endif #include #include 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Texture.cc,v 1.9 2004/08/26 16:37:48 rathnor Exp $ +// $Id: Texture.cc,v 1.10 2004/08/31 15:26:39 rathnor Exp $ #include "App.hh" #include "Texture.hh" #include -#include -#include +#ifdef HAVE_CSTRING + #include +#else + #include +#endif +#ifdef HAVE_CCTYPE + #include +#else + #include +#endif namespace FbTk { 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: TextureRender.cc,v 1.10 2004/07/05 23:51:57 fluxgen Exp $ +// $Id: TextureRender.cc,v 1.11 2004/08/31 15:26:39 rathnor Exp $ #include "TextureRender.hh" @@ -34,7 +34,11 @@ #include #include -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif using namespace std; 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Theme.cc,v 1.28 2004/08/26 18:26:39 akir Exp $ +// $Id: Theme.cc,v 1.29 2004/08/31 15:26:39 rathnor Exp $ #include "Theme.hh" @@ -30,7 +30,11 @@ #include "Directory.hh" #include "I18n.hh" -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif #include #include 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: ThemeItems.hh,v 1.7 2004/08/26 16:37:48 rathnor Exp $ +// $Id: ThemeItems.hh,v 1.8 2004/08/31 15:26:39 rathnor Exp $ /// @file implements common theme items @@ -34,7 +34,11 @@ #include "Image.hh" #include -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif #include namespace FbTk { 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 @@ #include #include #include -#include +#ifdef HAVE_CASSERT + #include +#else + #include +#endif namespace FbTk { 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 @@ #include "RefCount.hh" -#include +#ifdef HAVE_CTIME + #include +#else + #include +#endif #include #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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: XFontImp.cc,v 1.8 2004/08/10 11:58:22 fluxgen Exp $ +// $Id: XFontImp.cc,v 1.9 2004/08/31 15:26:39 rathnor Exp $ #include "XFontImp.hh" #include "App.hh" @@ -31,7 +31,11 @@ #include #include -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif using namespace std; 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: XmbFontImp.cc,v 1.9 2004/08/28 18:10:19 rathnor Exp $ +// $Id: XmbFontImp.cc,v 1.10 2004/08/31 15:26:39 rathnor Exp $ #include "XmbFontImp.hh" @@ -38,10 +38,22 @@ #define _GNU_SOURCE #endif // _GNU_SOURCE -#include -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif +#ifdef HAVE_CSTDARG + #include +#else + #include +#endif #include -#include +#ifdef HAVE_CSTRING + #include +#else + #include +#endif using namespace std; diff --git a/src/IntResMenuItem.cc b/src/IntResMenuItem.cc index 0074409..292b768 100644 --- a/src/IntResMenuItem.cc +++ b/src/IntResMenuItem.cc @@ -19,11 +19,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: IntResMenuItem.cc,v 1.3 2004/06/10 17:24:24 fluxgen Exp $ +// $Id: IntResMenuItem.cc,v 1.4 2004/08/31 15:26:38 rathnor Exp $ #include "IntResMenuItem.hh" #include "PixmapWithMask.hh" -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif namespace { diff --git a/src/Keys.cc b/src/Keys.cc index aef2b8f..8b9d1ea 100644 --- a/src/Keys.cc +++ b/src/Keys.cc @@ -19,7 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -//$Id: Keys.cc,v 1.43 2004/06/07 11:46:04 rathnor Exp $ +//$Id: Keys.cc,v 1.44 2004/08/31 15:26:38 rathnor Exp $ #include "Keys.hh" @@ -41,10 +41,26 @@ #include #endif // HAVE_CTYPE_H -#include -#include -#include -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif +#ifdef HAVE_CSTDLIB + #include +#else + #include +#endif +#ifdef HAVE_CERRNO + #include +#else + #include +#endif +#ifdef HAVE_CSTRING + #include +#else + #include +#endif #ifdef HAVE_SYS_TYPES_H #include @@ -69,7 +85,11 @@ #include #include #include -#include +#ifdef HAVE_CASSERT + #include +#else + #include +#endif #include using namespace std; diff --git a/src/Screen.hh b/src/Screen.hh index 26938df..b81110f 100644 --- a/src/Screen.hh +++ b/src/Screen.hh @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Screen.hh,v 1.142 2004/06/21 15:23:42 rathnor Exp $ +// $Id: Screen.hh,v 1.143 2004/08/31 15:26:38 rathnor Exp $ #ifndef SCREEN_HH #define SCREEN_HH @@ -40,7 +40,11 @@ #include #include -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif #include #include #include diff --git a/src/Shape.cc b/src/Shape.cc index bddb784..22156f4 100644 --- a/src/Shape.cc +++ b/src/Shape.cc @@ -19,7 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Shape.cc,v 1.12 2004/08/10 19:34:35 fluxgen Exp $ +// $Id: Shape.cc,v 1.13 2004/08/31 15:26:38 rathnor Exp $ #include "Shape.hh" @@ -28,7 +28,11 @@ #include "FbTk/GContext.hh" #include "FbTk/FbPixmap.hh" -#include +#ifdef HAVE_CSTRING + #include +#else + #include +#endif #include #ifdef HAVE_CONFIG_H diff --git a/src/Slit.cc b/src/Slit.cc index b0313f4..4068bca 100644 --- a/src/Slit.cc +++ b/src/Slit.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Slit.cc,v 1.97 2004/08/30 11:34:56 akir Exp $ +// $Id: Slit.cc,v 1.98 2004/08/31 15:26:38 rathnor Exp $ #include "Slit.hh" @@ -61,7 +61,11 @@ #include #include -#include +#ifdef HAVE_CASSERT + #include +#else + #include +#endif #ifdef HAVE_SYS_STAT_H #include diff --git a/src/Toolbar.cc b/src/Toolbar.cc index 97dfea3..e504a9a 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Toolbar.cc,v 1.150 2004/08/29 12:33:53 rathnor Exp $ +// $Id: Toolbar.cc,v 1.151 2004/08/31 15:26:38 rathnor Exp $ #include "Toolbar.hh" @@ -62,7 +62,11 @@ #include #include -#include +#ifdef HAVE_CSTRING + #include +#else + #include +#endif #include using namespace std; diff --git a/src/WinClient.cc b/src/WinClient.cc index a31094e..fc8a018 100644 --- a/src/WinClient.cc +++ b/src/WinClient.cc @@ -19,7 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: WinClient.cc,v 1.41 2004/08/10 13:36:07 fluxgen Exp $ +// $Id: WinClient.cc,v 1.42 2004/08/31 15:26:38 rathnor Exp $ #include "WinClient.hh" @@ -35,7 +35,11 @@ #include #include #include -#include +#ifdef HAVE_CASSERT + #include +#else + #include +#endif using namespace std; diff --git a/src/Window.cc b/src/Window.cc index c3f6190..8187c15 100644 --- a/src/Window.cc +++ b/src/Window.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Window.cc,v 1.297 2004/08/29 12:35:29 rathnor Exp $ +// $Id: Window.cc,v 1.298 2004/08/31 15:26:38 rathnor Exp $ #include "Window.hh" @@ -61,10 +61,22 @@ #include #include -#include -#include +#ifdef HAVE_CSTRING + #include +#else + #include +#endif +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif #include -#include +#ifdef HAVE_CASSERT + #include +#else + #include +#endif #include #include diff --git a/src/Workspace.cc b/src/Workspace.cc index 18a2ba5..cafdb0c 100644 --- a/src/Workspace.cc +++ b/src/Workspace.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Workspace.cc,v 1.98 2004/06/21 09:53:01 rathnor Exp $ +// $Id: Workspace.cc,v 1.99 2004/08/31 15:26:39 rathnor Exp $ #include "Workspace.hh" @@ -48,8 +48,16 @@ #include #include -#include -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif +#ifdef HAVE_CSTRING + #include +#else + #include +#endif #include #include diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc index 9715ff9..454cb49 100644 --- a/src/WorkspaceCmd.cc +++ b/src/WorkspaceCmd.cc @@ -20,7 +20,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: WorkspaceCmd.cc,v 1.12 2004/08/10 12:08:31 fluxgen Exp $ +// $Id: WorkspaceCmd.cc,v 1.13 2004/08/31 15:26:39 rathnor Exp $ #include "WorkspaceCmd.hh" @@ -32,7 +32,11 @@ #include "FbTk/KeyUtil.hh" -#include +#ifdef HAVE_CMATH + #include +#else + #include +#endif #include #include #include diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 07c86fd..a484434 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: fluxbox.cc,v 1.250 2004/08/27 17:24:49 rathnor Exp $ +// $Id: fluxbox.cc,v 1.251 2004/08/31 15:26:39 rathnor Exp $ #include "fluxbox.hh" @@ -94,9 +94,21 @@ class Toolbar { }; // system headers -#include -#include -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif +#ifdef HAVE_CSTDLIB + #include +#else + #include +#endif +#ifdef HAVE_CSTRING + #include +#else + #include +#endif #ifdef HAVE_UNISTD_H #include diff --git a/src/fluxbox.hh b/src/fluxbox.hh index d61452a..96b883d 100644 --- a/src/fluxbox.hh +++ b/src/fluxbox.hh @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: fluxbox.hh,v 1.89 2004/07/15 09:52:14 fluxgen Exp $ +// $Id: fluxbox.hh,v 1.90 2004/08/31 15:26:39 rathnor Exp $ #ifndef FLUXBOX_HH #define FLUXBOX_HH @@ -36,7 +36,11 @@ #include #include -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/main.cc b/src/main.cc index 68bb62f..3c9dc7f 100644 --- a/src/main.cc +++ b/src/main.cc @@ -20,7 +20,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: main.cc,v 1.30 2004/06/07 11:46:04 rathnor Exp $ +// $Id: main.cc,v 1.31 2004/08/31 15:26:39 rathnor Exp $ #include "fluxbox.hh" #include "version.h" @@ -38,9 +38,21 @@ #define _GNU_SOURCE #endif // _GNU_SOURCE -#include -#include -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif +#ifdef HAVE_CSTDLIB + #include +#else + #include +#endif +#ifdef HAVE_CSTRING + #include +#else + #include +#endif #include #include #include diff --git a/src/tests/Resourcetest.cc b/src/tests/Resourcetest.cc index f82c4b4..99dfc54 100644 --- a/src/tests/Resourcetest.cc +++ b/src/tests/Resourcetest.cc @@ -28,7 +28,11 @@ #include #include -#include +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif using namespace std; diff --git a/src/tests/signaltest.cc b/src/tests/signaltest.cc index ef7643f..cc838b0 100644 --- a/src/tests/signaltest.cc +++ b/src/tests/signaltest.cc @@ -22,7 +22,11 @@ #include "../FbTk/SignalHandler.hh" #include -#include +#ifdef HAVE_CASSERT + #include +#else + #include +#endif using namespace std; using namespace FbTk; diff --git a/util/bsetroot.cc b/util/bsetroot.cc index 9735e05..86d1efb 100644 --- a/util/bsetroot.cc +++ b/util/bsetroot.cc @@ -18,7 +18,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// $Id: bsetroot.cc,v 1.21 2004/06/08 13:15:30 rathnor Exp $ +// $Id: bsetroot.cc,v 1.22 2004/08/31 15:26:40 rathnor Exp $ #include "bsetroot.hh" @@ -32,9 +32,21 @@ #include -#include -#include -#include +#ifdef HAVE_CSTRING + #include +#else + #include +#endif +#ifdef HAVE_CSTDLIB + #include +#else + #include +#endif +#ifdef HAVE_CSTDIO + #include +#else + #include +#endif #include using namespace std; diff --git a/util/fbrun/FbRun.cc b/util/fbrun/FbRun.cc index 025440a..09efd12 100644 --- a/util/fbrun/FbRun.cc +++ b/util/fbrun/FbRun.cc @@ -19,7 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: FbRun.cc,v 1.30 2004/04/22 21:01:58 fluxgen Exp $ +// $Id: FbRun.cc,v 1.31 2004/08/31 15:26:40 rathnor Exp $ #include "FbRun.hh" @@ -48,7 +48,11 @@ #include #include #include -#include +#ifdef HAVE_CASSERT + #include +#else + #include +#endif using namespace std; FbRun::FbRun(int x, int y, size_t width): -- cgit v0.11.2