diff options
| author | Abdiel Janulgue <abdiel.janulgue@nokia.com> | 2010-07-21 01:22:39 +0300 |
|---|---|---|
| committer | Abdiel Janulgue <abdiel.janulgue@nokia.com> | 2010-07-21 01:22:39 +0300 |
| commit | 6557ba2f2f3bb5a1ac22e7e24cfe9ceb3a5231a9 (patch) | |
| tree | 42cf26a670677b5fc7d859ebc8741fb1798f36d0 /src | |
| parent | f5007f30eb96a256b5ef0b2a13473e01d1b33f8e (diff) | |
Changes: make sure it compiles for all platforms
Diffstat (limited to 'src')
| -rw-r--r-- | src/mcompositemanager.cpp | 2 | ||||
| -rw-r--r-- | src/mwindowpropertycache.cpp | 6 | ||||
| -rw-r--r-- | src/mwindowpropertycache.h | 5 |
3 files changed, 13 insertions, 0 deletions
diff --git a/src/mcompositemanager.cpp b/src/mcompositemanager.cpp index 4901b4b..c4d161b 100644 --- a/src/mcompositemanager.cpp +++ b/src/mcompositemanager.cpp @@ -34,7 +34,9 @@ #include <X11/Xutil.h> #include <X11/extensions/Xcomposite.h> #include <X11/extensions/Xfixes.h> + #include <X11/extensions/shape.h> + #include <X11/Xatom.h> #include <X11/Xmd.h> #include <X11/XKBlib.h> diff --git a/src/mwindowpropertycache.cpp b/src/mwindowpropertycache.cpp index a11f82c..da8973b 100644 --- a/src/mwindowpropertycache.cpp +++ b/src/mwindowpropertycache.cpp @@ -23,7 +23,13 @@ #include <QDebug> #include <X11/Xatom.h> #include <X11/extensions/Xrender.h> + +#ifdef HAVE_SHAPECONST +#include <X11/extensions/shapeconst.h> +#else #include <X11/extensions/shape.h> +#endif + #include <X11/Xmd.h> #include "mwindowpropertycache.h" diff --git a/src/mwindowpropertycache.h b/src/mwindowpropertycache.h index 5f049a0..fba5ae4 100644 --- a/src/mwindowpropertycache.h +++ b/src/mwindowpropertycache.h @@ -24,7 +24,12 @@ #include <X11/Xlib-xcb.h> #include <xcb/render.h> #include <xcb/shape.h> + +#ifdef HAVE_SHAPECONST +#include <X11/extensions/shapeconst.h> +#else #include <X11/extensions/shape.h> +#endif #include "mcompatoms_p.h" #include <QRegion> |