all repos — fluxbox @ 329fca30fdbbc051a733c6d15efa6b95370ac221

custom fork of the fluxbox windowmanager 

updates for compiling with gcc 4.3
markt markt
commit

329fca30fdbbc051a733c6d15efa6b95370ac221

parent

35251ef5c9bcf12abeee3e9b69a0ef85df3319dc

25 files changed, 143 insertions(+), 0 deletions(-)

jump to
M ChangeLog → ChangeLog 
@@ -1,5 +1,7 @@ 
  (Format: Year/Month/Day)
 Changes for 1.0.0:
+*07/06/29:
+   * Updates for compiling with gcc 4.3 (thanks Dmitry E. Oboukhov)
 *07/06/28:
    * Strip off additional bits in event state set by Xorg, bug #1736252 (Mark)
      FbTk/KeyUtil.hh
M src/Ewmh.cc → 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;
M src/FbCommands.cc → src/FbCommands.cc 
@@ -45,6 +45,11 @@ #include <cstdlib>
 #else
   #include <stdlib.h>
 #endif
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 
 #ifdef HAVE_CONFIG_H
M src/FbTk/FbPixmap.cc → 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;
M src/FbTk/FbString.cc → src/FbTk/FbString.cc 
@@ -27,6 +27,16 @@ #include <cerrno>
 #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"
M src/FbTk/KeyUtil.cc → src/FbTk/KeyUtil.cc 
@@ -25,6 +25,11 @@ #include "KeyUtil.hh"
 #include "App.hh"
 
 #include <string>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 namespace {
M src/FbTk/Menu.cc → src/FbTk/Menu.cc 
@@ -67,6 +67,9 @@ #include <string.h>
 #endif
 #include <typeinfo>
 
+#include <algorithm>
+
+
 #ifdef DEBUG
 #include <iostream>
 using std::cout;
M src/FbTk/StringUtil.cc → src/FbTk/StringUtil.cc 
@@ -44,6 +44,11 @@ #include <cassert>
 #else
   #include <assert.h>
 #endif
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 
 #include <memory>
M src/FbTk/TextBox.cc → src/FbTk/TextBox.cc 
@@ -32,6 +32,16 @@ #include <cctype>
 #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>
M src/FbTk/TextureRender.cc → src/FbTk/TextureRender.cc 
@@ -39,6 +39,11 @@ #include <cstdio>
 #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
M src/FbTk/ThemeItems.cc → src/FbTk/ThemeItems.cc 
@@ -45,6 +45,16 @@ #include <cstdio>
 #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>
M src/FbTk/XFontImp.cc → src/FbTk/XFontImp.cc 
@@ -36,6 +36,14 @@ #include <cstdio>
 #else
   #include <stdio.h>
 #endif
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
+
+#include <algorithm>
+
 
 using std::cerr;
 using std::endl;
M src/FocusControl.cc → src/FocusControl.cc 
@@ -34,6 +34,11 @@ #include "FbTk/EventManager.hh"
 
 #include <string>
 #include <iostream>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 using std::cerr;
 using std::endl;
M src/Gnome.cc → src/Gnome.cc 
@@ -33,6 +33,11 @@ #include "FbTk/I18n.hh"
 
 #include <iostream>
 #include <new>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 using std::cerr;
 using std::endl;
M src/IconbarTool.cc → 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;
M src/Remember.cc → src/Remember.cc 
@@ -44,6 +44,11 @@ #include "FbTk/Transparent.hh"
 
 
 #include <X11/Xlib.h>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 //use GNU extensions
 #ifndef	 _GNU_SOURCE
M src/Resources.cc → 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;
M src/RootTheme.cc → src/RootTheme.cc 
@@ -41,6 +41,11 @@ #include <iostream>
 
 #include <sys/types.h>
 #include <sys/wait.h>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 using std::cerr;
 using std::endl;
M src/Screen.cc → src/Screen.cc 
@@ -135,6 +135,11 @@ #include <iostream>
 #include <algorithm>
 #include <functional>
 #include <stack>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 using std::cerr;
 using std::endl;
M src/ScreenPlacement.cc → src/ScreenPlacement.cc 
@@ -34,6 +34,11 @@ #include "Window.hh"
 
 #include <iostream>
 #include <exception>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 using std::cerr;
 using std::endl;
M src/ScreenResources.cc → src/ScreenResources.cc 
@@ -27,6 +27,11 @@ // holds screen resource handling
 
 #include "Screen.hh"
 #include <string>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 using std::string;
M src/Slit.cc → src/Slit.cc 
@@ -75,6 +75,11 @@ #include <X11/Xlib.h>
 
 #include <iostream>
 #include <algorithm>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 using std::string;
 using std::pair;
M src/WinClient.cc → src/WinClient.cc 
@@ -43,6 +43,11 @@ #include <cassert>
 #else
   #include <assert.h>
 #endif
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 using std::string;
 using std::list;
M src/Xutil.cc → src/Xutil.cc 
@@ -32,6 +32,11 @@ #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <iostream>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 using std::string;
M util/fbrun/main.cc → util/fbrun/main.cc 
@@ -34,6 +34,16 @@ #endif // XINERAMA
 
 #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;