commit b3ae9794896e1a6cae22fd3fd4fcabdb11d327c7
author Mathias Agopian <mathias@google.com> Tue Aug 10 13:55:30 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 10 13:55:30 2010 -0700
tree cf4d07d949808626576a5eff71dc2d15cbf62fcf
parent 2fe99573734cd4871f802d342feabd88f21d9a36
parent 754c7a01d76493a2c3afafe21c3d52abbada3ef0

am 754c7a01: am 60d641e5: Merge "first stab at hwcomposer HAL and default implementation." into gingerbread

Merge commit '754c7a01d76493a2c3afafe21c3d52abbada3ef0'

* commit '754c7a01d76493a2c3afafe21c3d52abbada3ef0':
  first stab at hwcomposer HAL and default implementation.

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>