diff options
| author | Tim Penhey <tim.penhey@canonical.com> | 2012-10-18 08:03:31 +0000 |
|---|---|---|
| committer | Tarmac <> | 2012-10-18 08:03:31 +0000 |
| commit | 01fa034334d3471f2b1faef5ead3a98357d5ed71 (patch) | |
| tree | 6a8ecf66aab86fc5133a3a440ef91a01fe17ad2c /unity-shared | |
| parent | 55a23d71f23acb365f54e5fd0298d8881dbac257 (diff) | |
| parent | cb7e3d839984acc0db60a44eea4a7ceea81761cf (diff) | |
More tweaks to get unity compiling on ARM without X.. Approved by Brandon Schaefer.
(bzr r2858)
Diffstat (limited to 'unity-shared')
| -rw-r--r-- | unity-shared/BGHash.cpp | 4 | ||||
| -rw-r--r-- | unity-shared/ResizingBaseWindow.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/unity-shared/BGHash.cpp b/unity-shared/BGHash.cpp index 4f66a873a..0b2b5afe1 100644 --- a/unity-shared/BGHash.cpp +++ b/unity-shared/BGHash.cpp @@ -22,6 +22,10 @@ #include <NuxCore/Logger.h> #include "unity-shared/UBusMessages.h" +#ifndef XA_STRING +#define XA_STRING ((Atom) 31) +#endif + namespace { nux::logging::Logger logger("unity.BGHash"); diff --git a/unity-shared/ResizingBaseWindow.h b/unity-shared/ResizingBaseWindow.h index ff400c1c2..c7f50cbb2 100644 --- a/unity-shared/ResizingBaseWindow.h +++ b/unity-shared/ResizingBaseWindow.h @@ -35,8 +35,10 @@ public: void UpdateInputWindowGeometry() { +#ifdef UNITY_HAS_X_ORG_SUPPORT if (m_input_window && m_input_window_enabled) m_input_window->SetGeometry(geo_func_(GetGeometry())); +#endif } virtual void SetGeometry(const nux::Geometry &geo) |