Merge "Ensure root layers and scenes aligned together properly rather than using...

diff --git a/dali/internal/render/renderers/render-property-buffer.h b/dali/internal/render/renderers/render-property-buffer.h
index 13771f5..c0f82fa 100644 (file)
--- a/dali/internal/render/renderers/render-property-buffer.h
+++ b/dali/internal/render/renderers/render-property-buffer.h
@@ -175,7 +175,7 @@ public:
   template <typename T>
   inline T* GetDataTypedPtr()
   {
-    Dali::Vector< char >* data = mData.Release();
+    Dali::Vector< uint8_t >* data = mData.Release();
     mData = data;
     return reinterpret_cast<T*>( &data->operator[]( 0 ) );
   }

diff --git a/dali/internal/update/animation/scene-graph-animator.h b/dali/internal/update/animation/scene-graph-animator.h
index 06679a2..0b3ff50 100644 (file)
--- a/dali/internal/update/animation/scene-graph-animator.h
+++ b/dali/internal/update/animation/scene-graph-animator.h
@@ -18,6 +18,9 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <cmath>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/animation/alpha-function.h>
 #include <dali/public-api/animation/animation.h>

diff --git a/dali/public-api/common/dali-common.cpp b/dali/public-api/common/dali-common.cpp
index 42d1331..2db0945 100644 (file)
--- a/dali/public-api/common/dali-common.cpp
+++ b/dali/public-api/common/dali-common.cpp
@@ -23,9 +23,12 @@
 #include <string>
 #include <cstdio>
 
+#if defined(BACKTRACE_ENABLED)
+#if defined(__GLIBC__)
 #include <execinfo.h>
+#endif
 #include <cxxabi.h>
-
+#endif
 #include <cstring>
 
 // INTERNAL INCLUDES