jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #349 from morphis/f/fix-comp-errors-armhf

Browse source 
Fix compilation errors on armhf
This commit is contained in:
Simon Fels 2017-07-10 21:41:23 +02:00 • committed by GitHub
commit 00ea7d9641
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/anbox/common/binary_writer.cpp
View file

@ -58,7 +58,7 @@ void BinaryWriter::write_uint16(std::uint16_t value) {
break; break;
} }
*reinterpret_cast<std::uint16_t*>(&(*current_)) = v; memcpy(&(*current_), &v, sizeof(std::uint16_t));
current_ += sizeof(v); current_ += sizeof(v);
} }
@ -77,8 +77,7 @@ void BinaryWriter::write_uint32(std::uint32_t value) {
default: default:
break; break;
} }
memcpy(&(*current_), &v, sizeof(std::uint32_t));
*reinterpret_cast<std::uint32_t*>(&(*current_)) = v;
current_ += sizeof(v); current_ += sizeof(v);
} }

3
src/anbox/graphics/emugl/RenderThreadInfo.cpp
View file

@ -16,8 +16,11 @@
#include "anbox/graphics/emugl/RenderThreadInfo.h" #include "anbox/graphics/emugl/RenderThreadInfo.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcast-align"
#include "external/android-emugl/shared/emugl/common/lazy_instance.h" #include "external/android-emugl/shared/emugl/common/lazy_instance.h"
#include "external/android-emugl/shared/emugl/common/thread_store.h" #include "external/android-emugl/shared/emugl/common/thread_store.h"
#pragma GCC diagnostic pop
namespace { namespace {
class ThreadInfoStore : public ::emugl::ThreadStore { class ThreadInfoStore : public ::emugl::ThreadStore {