Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 7 insertions, 1 deletions

diff --git a/src/FbTk/Shape.cc b/src/FbTk/Shape.cc
index 6bb63aa..c952403 100644
--- a/src/FbTk/Shape.cc
+++ b/src/FbTk/Shape.cc
@@ -36,6 +36,12 @@
   #include <string.h>
 #endif
 
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
+
 #include <X11/Xutil.h>
 
 #ifdef SHAPE
@@ -103,7 +109,7 @@ struct CornerPixmaps {
 // unfortunately, we need a separate pixmap per screen
 std::vector<CornerPixmaps> s_corners;
 
-}; // end of anonymous namespace
+} // end of anonymous namespace
 
 Shape::Shape(FbWindow &win, int shapeplaces):
     m_win(&win),