From cb7e3d839984acc0db60a44eea4a7ceea81761cf Mon Sep 17 00:00:00 2001
From: Tim Penhey <tim.penhey@canonical.com>
Date: Thu, 18 Oct 2012 13:27:52 +1300
Subject: Other changes needed to make arm builds work.

(bzr r2849.2.3)
---
 unity-shared/BGHash.cpp           | 4 ++++
 unity-shared/ResizingBaseWindow.h | 2 ++
 2 files changed, 6 insertions(+)

(limited to 'unity-shared')

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)
-- 
cgit v1.2.3