From df6d2e23ac7bb45b1aea68193a4207b8804bf8d8 Mon Sep 17 00:00:00 2001 From: Anton Obzhirov Date: Wed, 20 Mar 2019 19:34:44 +0000 Subject: [PATCH] Make the core code a bit more generic to be able to compile without glibc. Change-Id: I876018729f2e7c19bbd21defe55c6a18508a06d9 --- dali/internal/render/renderers/render-property-buffer.h | 2 +- dali/internal/update/animation/scene-graph-animator.h | 3 +++ dali/public-api/common/dali-common.cpp | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dali/internal/render/renderers/render-property-buffer.h b/dali/internal/render/renderers/render-property-buffer.h index 13771f5..c0f82fa 100644 --- a/dali/internal/render/renderers/render-property-buffer.h +++ b/dali/internal/render/renderers/render-property-buffer.h @@ -175,7 +175,7 @@ public: template inline T* GetDataTypedPtr() { - Dali::Vector< char >* data = mData.Release(); + Dali::Vector< uint8_t >* data = mData.Release(); mData = data; return reinterpret_cast( &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 --- 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 + // INTERNAL INCLUDES #include #include diff --git a/dali/public-api/common/dali-common.cpp b/dali/public-api/common/dali-common.cpp index 42d1331..2db0945 100644 --- a/dali/public-api/common/dali-common.cpp +++ b/dali/public-api/common/dali-common.cpp @@ -23,9 +23,12 @@ #include #include +#if defined(BACKTRACE_ENABLED) +#if defined(__GLIBC__) #include +#endif #include - +#endif #include // INTERNAL INCLUDES -- 2.7.4