commit f3f822edc7d9f08edc91a2e1826de127a19c235d
author Brian Carlstrom <bdc@google.com> Thu Sep 16 23:51:31 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 16 23:51:31 2010 -0700
tree 523616491df2df69193e4609d505ba117d0c0c4a
parent 156edcc9f64e010d6b6de97e9a77adfccee353eb
parent 987ba54127caaaa87056965b3d98b7e1a5b110b7

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

libs/ui/GraphicLog.cpp

diff --git a/libs/ui/GraphicLog.cpp b/libs/ui/GraphicLog.cpp
index b55ce23..7ba2779 100644
--- a/libs/ui/GraphicLog.cpp
+++ b/libs/ui/GraphicLog.cpp
@@ -30,7 +30,11 @@
 
 static inline
 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);
+#endif
     base[pos] = EVENT_TYPE_INT;
     memcpy(&base[pos+1], &v, sizeof(int32_t));
     pos += 1+sizeof(int32_t);
@@ -38,7 +42,11 @@
 
 static inline
 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);
+#endif
     base[pos] = EVENT_TYPE_LONG;
     memcpy(&base[pos+1], &v, sizeof(int64_t));
     pos += 1+sizeof(int64_t);