diff options
| author | Abdiel Janulgue <abdiel.janulgue@nokia.com> | 2010-03-11 16:58:47 +0200 |
|---|---|---|
| committer | Abdiel Janulgue <abdiel.janulgue@nokia.com> | 2010-03-11 16:58:47 +0200 |
| commit | 48e42ba19cd5de39332afd6b9f33512f784de18c (patch) | |
| tree | 596ed0cb8546c88cd4cc60a6fa43ba86c4ce29a9 /decorators | |
| parent | bda79f8552835fd3b0f72da514f0853e26dc89ec (diff) | |
| parent | a311c55d4e32bbed296cf671e46d3adb22491acf (diff) | |
Merge commit 'refs/merge-requests/3' of git@gitorious.org:maemo-6-ui-framework/duicompositor
Diffstat (limited to 'decorators')
| -rw-r--r-- | decorators/duidecorator/duidecoratorwindow.cpp | 4 | ||||
| -rw-r--r-- | decorators/duidecorator/duidecoratorwindow.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/decorators/duidecorator/duidecoratorwindow.cpp b/decorators/duidecorator/duidecoratorwindow.cpp index 764acfe..ca75941 100644 --- a/decorators/duidecorator/duidecoratorwindow.cpp +++ b/decorators/duidecorator/duidecoratorwindow.cpp @@ -34,7 +34,11 @@ #include <X11/Xatom.h> #include <X11/Xmd.h> #include <X11/extensions/Xfixes.h> +#ifdef HAVE_SHAPECONST #include <X11/extensions/shapeconst.h> +#else +#include <X11/extensions/shape.h> +#endif #include <duiabstractdecorator.h> diff --git a/decorators/duidecorator/duidecoratorwindow.h b/decorators/duidecorator/duidecoratorwindow.h index e67dc02..12bbb27 100644 --- a/decorators/duidecorator/duidecoratorwindow.h +++ b/decorators/duidecorator/duidecoratorwindow.h @@ -22,7 +22,11 @@ #include <DuiWindow> #include <X11/Xlib.h> +#ifdef HAVE_SHAPECONST #include <X11/extensions/shapeconst.h> +#else +#include <X11/extensions/shape.h> +#endif #include <QObject> |