diff options
author | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
---|---|---|
committer | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
commit | 839ea523164caecd8c779e60539b78c2a748a81f (patch) | |
tree | 0019d04f27a1a258bc7a900e3cf77b916dca6493 /src/FbTk/Shape.cc | |
parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
download | fluxbox_lack-testing/argb.zip fluxbox_lack-testing/argb.tar.bz2 |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/FbTk/Shape.cc')
-rw-r--r-- | src/FbTk/Shape.cc | 8 |
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 @@ | |||
36 | #include <string.h> | 36 | #include <string.h> |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | #ifdef HAVE_CSTDLIB | ||
40 | #include <cstdlib> | ||
41 | #else | ||
42 | #include <stdlib.h> | ||
43 | #endif | ||
44 | |||
39 | #include <X11/Xutil.h> | 45 | #include <X11/Xutil.h> |
40 | 46 | ||
41 | #ifdef SHAPE | 47 | #ifdef SHAPE |
@@ -103,7 +109,7 @@ struct CornerPixmaps { | |||
103 | // unfortunately, we need a separate pixmap per screen | 109 | // unfortunately, we need a separate pixmap per screen |
104 | std::vector<CornerPixmaps> s_corners; | 110 | std::vector<CornerPixmaps> s_corners; |
105 | 111 | ||
106 | }; // end of anonymous namespace | 112 | } // end of anonymous namespace |
107 | 113 | ||
108 | Shape::Shape(FbWindow &win, int shapeplaces): | 114 | Shape::Shape(FbWindow &win, int shapeplaces): |
109 | m_win(&win), | 115 | m_win(&win), |