commit 5c0b977701a31d17a4ab9dec17dfa68f3c01aeaf
author Mathias Agopian <mathias@google.com> Thu Jul 29 18:20:40 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 29 18:20:40 2010 -0700
tree c3e254a9cf6976f5efee40673b7cb62f65c61efc
parent 1a4ca397256ffe5d9d3cab5ecfbfdcd8f9196e0e
parent bb2c87ea03c6bff09ea05dc6ba69796efe31ebdb

am bb2c87ea: am 1511e20f: improved comments and added a minDelay attribute to sensor_t

Merge commit 'bb2c87ea03c6bff09ea05dc6ba69796efe31ebdb'

* commit 'bb2c87ea03c6bff09ea05dc6ba69796efe31ebdb':
  improved comments and added a minDelay attribute to sensor_t

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>