Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fcfb4e6 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am 987ba541: Merge "Fix sim-eng build on Hardy" into gingerbread

Merge commit '987ba54127caaaa87056965b3d98b7e1a5b110b7' into gingerbread-plus-aosp

* commit '987ba54127caaaa87056965b3d98b7e1a5b110b7':
  Fix sim-eng build on Hardy
parents 92f2512e ce802e33
Loading
Loading
Loading
Loading
+8 −0
Original line number Original line Diff line number Diff line
@@ -30,7 +30,11 @@ ANDROID_SINGLETON_STATIC_INSTANCE(GraphicLog)


static inline
static inline
void writeInt32(uint8_t* base, size_t& pos, int32_t value) {
void writeInt32(uint8_t* base, size_t& pos, int32_t value) {
#ifdef HAVE_LITTLE_ENDIAN
    int32_t v = value;
#else
    int32_t v = htole32(value);
    int32_t v = htole32(value);
#endif
    base[pos] = EVENT_TYPE_INT;
    base[pos] = EVENT_TYPE_INT;
    memcpy(&base[pos+1], &v, sizeof(int32_t));
    memcpy(&base[pos+1], &v, sizeof(int32_t));
    pos += 1+sizeof(int32_t);
    pos += 1+sizeof(int32_t);
@@ -38,7 +42,11 @@ void writeInt32(uint8_t* base, size_t& pos, int32_t value) {


static inline
static inline
void writeInt64(uint8_t* base,  size_t& pos, int64_t value) {
void writeInt64(uint8_t* base,  size_t& pos, int64_t value) {
#ifdef HAVE_LITTLE_ENDIAN
    int64_t v = value;
#else
    int64_t v = htole64(value);
    int64_t v = htole64(value);
#endif
    base[pos] = EVENT_TYPE_LONG;
    base[pos] = EVENT_TYPE_LONG;
    memcpy(&base[pos+1], &v, sizeof(int64_t));
    memcpy(&base[pos+1], &v, sizeof(int64_t));
    pos += 1+sizeof(int64_t);
    pos += 1+sizeof(int64_t);