commit d521dcac2ede5b825a3ded10713d7b76cacf0055
author Mathias Agopian <mathias@google.com> Sat Jul 31 12:19:29 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sat Jul 31 12:19:29 2010 -0700
tree 0d97575247c4721c41bc2583f7b89c0b2a0f8d0c
parent 5c0b977701a31d17a4ab9dec17dfa68f3c01aeaf
parent ae3b05e8f38e588df1a500ccea9f7961c93686ba

am ae3b05e8: am 67d82220: temporary hack to allow compilation of adreno driver

Merge commit 'ae3b05e8f38e588df1a500ccea9f7961c93686ba'

* commit 'ae3b05e8f38e588df1a500ccea9f7961c93686ba':
  temporary hack to allow compilation of adreno driver

include/hardware/sensors_deprecated.h

diff --git a/include/hardware/sensors_deprecated.h b/include/hardware/sensors_deprecated.h
index 7974788..ee667d6 100644
--- a/include/hardware/sensors_deprecated.h
+++ b/include/hardware/sensors_deprecated.h
@@ -29,6 +29,7 @@
         float           temperature;
         float           distance;
         float           light;
+        float           pressure;
     };
     int64_t         time;
     uint32_t        reserved;

tests/nusensors/nusensors.cpp

diff --git a/tests/nusensors/nusensors.cpp b/tests/nusensors/nusensors.cpp
index 731fa09..29e2069 100644
--- a/tests/nusensors/nusensors.cpp
+++ b/tests/nusensors/nusensors.cpp
@@ -15,6 +15,7 @@
  */
 
 #include <stdint.h>
+#include <string.h>
 #include <sys/cdefs.h>
 #include <sys/types.h>