Package: fluxbox Version: 1.0~rc3 Followup-For: Bug #417188 please check if everything is correct and can be built correctly.
--- fluxbox-1.0~rc3/src/RootTheme.cc +++ fluxbox-1.0~rc3/src/RootTheme.cc @@ -41,6 +41,11 @@ #include <sys/types.h> #include <sys/wait.h> +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif using std::cerr; using std::endl; --- fluxbox-1.0~rc3/src/Screen.cc +++ fluxbox-1.0~rc3/src/Screen.cc @@ -139,6 +139,11 @@ #include <algorithm> #include <functional> #include <stack> +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif using std::cerr; using std::endl; --- fluxbox-1.0~rc3/src/ScreenResources.cc +++ fluxbox-1.0~rc3/src/ScreenResources.cc @@ -27,6 +27,11 @@ #include "Screen.hh" #include <string> +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif using std::string; --- fluxbox-1.0~rc3/src/Slit.cc +++ fluxbox-1.0~rc3/src/Slit.cc @@ -75,6 +75,11 @@ #include <iostream> #include <algorithm> +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif using std::string; using std::pair; --- fluxbox-1.0~rc3/src/FbCommands.cc +++ fluxbox-1.0~rc3/src/FbCommands.cc @@ -45,6 +45,11 @@ #else #include <stdlib.h> #endif +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif #ifdef HAVE_CONFIG_H --- fluxbox-1.0~rc3/src/WinClient.cc +++ fluxbox-1.0~rc3/src/WinClient.cc @@ -43,6 +43,11 @@ #else #include <assert.h> #endif +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif using std::string; using std::list; --- fluxbox-1.0~rc3/src/Xutil.cc +++ fluxbox-1.0~rc3/src/Xutil.cc @@ -32,6 +32,11 @@ #include <X11/Xatom.h> #include <X11/Xlib.h> #include <iostream> +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif using std::string; --- fluxbox-1.0~rc3/src/Resources.cc +++ fluxbox-1.0~rc3/src/Resources.cc @@ -35,6 +35,11 @@ #include <stdio.h> #include <string> #include <vector> +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif using std::string; using std::vector; --- fluxbox-1.0~rc3/src/FocusControl.cc +++ fluxbox-1.0~rc3/src/FocusControl.cc @@ -34,6 +34,11 @@ #include <string> #include <iostream> +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif using std::cerr; using std::endl; --- fluxbox-1.0~rc3/src/ScreenPlacement.cc +++ fluxbox-1.0~rc3/src/ScreenPlacement.cc @@ -34,6 +34,11 @@ #include <iostream> #include <exception> +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif using std::cerr; using std::endl; --- fluxbox-1.0~rc3/src/Ewmh.cc +++ fluxbox-1.0~rc3/src/Ewmh.cc @@ -42,6 +42,11 @@ #include <iostream> #include <algorithm> #include <new> +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif using std::cerr; using std::endl; --- fluxbox-1.0~rc3/src/Gnome.cc +++ fluxbox-1.0~rc3/src/Gnome.cc @@ -33,6 +33,11 @@ #include <iostream> #include <new> +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif using std::cerr; using std::endl; --- fluxbox-1.0~rc3/src/Remember.cc +++ fluxbox-1.0~rc3/src/Remember.cc @@ -44,6 +44,11 @@ #include <X11/Xlib.h> +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif //use GNU extensions #ifndef _GNU_SOURCE --- fluxbox-1.0~rc3/src/IconbarTool.cc +++ fluxbox-1.0~rc3/src/IconbarTool.cc @@ -49,6 +49,11 @@ #include <typeinfo> #include <string> #include <iterator> +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif using std::string; using std::list; --- fluxbox-1.0~rc3/src/FbTk/Menu.cc +++ fluxbox-1.0~rc3/src/FbTk/Menu.cc @@ -64,6 +64,9 @@ #include <string.h> #endif #include <typeinfo> + +#include <algorithm> + #ifdef DEBUG #include <iostream> --- fluxbox-1.0~rc3/src/FbTk/TextureRender.cc +++ fluxbox-1.0~rc3/src/FbTk/TextureRender.cc @@ -39,6 +39,11 @@ #else #include <stdio.h> #endif +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif // mipspro has no new(nothrow) #if defined sgi && ! defined GCC --- fluxbox-1.0~rc3/src/FbTk/ThemeItems.cc +++ fluxbox-1.0~rc3/src/FbTk/ThemeItems.cc @@ -45,6 +45,16 @@ #else #include <stdio.h> #endif +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif +#ifdef HAVE_CSTDLIB + #include <cstdlib> +#else + #include <stdlib.h> +#endif #include <iostream> #include <memory> --- fluxbox-1.0~rc3/src/FbTk/XFontImp.cc +++ fluxbox-1.0~rc3/src/FbTk/XFontImp.cc @@ -36,6 +36,14 @@ #else #include <stdio.h> #endif +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif + +#include <algorithm> + using std::cerr; using std::endl; --- fluxbox-1.0~rc3/src/FbTk/StringUtil.cc +++ fluxbox-1.0~rc3/src/FbTk/StringUtil.cc @@ -44,6 +44,11 @@ #else #include <assert.h> #endif +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif #include <memory> --- fluxbox-1.0~rc3/src/FbTk/FbString.cc +++ fluxbox-1.0~rc3/src/FbTk/FbString.cc @@ -27,6 +27,16 @@ #else #include <errno.h> #endif +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif +#ifdef HAVE_CSTDLIB + #include <cstdlib> +#else + #include <stdlib.h> +#endif #include "FbString.hh" #include "config.h" --- fluxbox-1.0~rc3/src/FbTk/FbPixmap.cc +++ fluxbox-1.0~rc3/src/FbTk/FbPixmap.cc @@ -30,6 +30,11 @@ #include <X11/Xutil.h> #include <X11/Xatom.h> #include <iostream> +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif using std::cerr; --- fluxbox-1.0~rc3/src/FbTk/TextBox.cc +++ fluxbox-1.0~rc3/src/FbTk/TextBox.cc @@ -32,6 +32,16 @@ #else #include <ctype.h> #endif +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif +#ifdef HAVE_CSTDLIB + #include <cstdlib> +#else + #include <stdlib.h> +#endif #include <X11/keysym.h> #include <X11/Xutil.h> --- fluxbox-1.0~rc3/src/FbTk/KeyUtil.cc +++ fluxbox-1.0~rc3/src/FbTk/KeyUtil.cc @@ -25,6 +25,11 @@ #include "App.hh" #include <string> +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif namespace { --- fluxbox-1.0~rc3/util/fbrun/main.cc +++ fluxbox-1.0~rc3/util/fbrun/main.cc @@ -34,6 +34,16 @@ #include <string> #include <iostream> +#ifdef HAVE_CSTRING + #include <cstring> +#else + #include <string.h> +#endif +#ifdef HAVE_CSTDLIB + #include <cstdlib> +#else + #include <stdlib.h> +#endif using std::cerr; using std::endl; -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]