commit 2ba551b90bc1d85f1e4897519736c3668bed1ab8
author Mathias Agopian <mathias@google.com> Thu Jul 22 17:17:45 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 22 17:17:45 2010 -0700
tree a50d7e6268ddf37b6b0171ca7bbb19bcd83cb029
parent b8c3babd6e9fb6258167716e9f33e89e84f2a4c2
parent f0e4ec1a04701c40e38a09a97e6f1c417163e0c2

am f0e4ec1a: am 66a4095c: Be more explicit about the rate at which sensor events must be returned

Merge commit 'f0e4ec1a04701c40e38a09a97e6f1c417163e0c2'

* commit 'f0e4ec1a04701c40e38a09a97e6f1c417163e0c2':
  Be more explicit about the rate at which sensor events must be returned

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>