commit 1a4ca397256ffe5d9d3cab5ecfbfdcd8f9196e0e
author Mathias Agopian <mathias@google.com> Thu Jul 29 18:20:38 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 29 18:20:38 2010 -0700
tree cc3308aa6bc6419f61a59fd83083ed063287e3e8
parent 0f1aaf80c7b1ea720fb2679000e35132587d9526
parent 0bcdefe8180c8d44e1d2ad6ec8e332263bd94377

am 0bcdefe8: am 1832f557: Added definition/documentation for pressure sensors

Merge commit '0bcdefe8180c8d44e1d2ad6ec8e332263bd94377'

* commit '0bcdefe8180c8d44e1d2ad6ec8e332263bd94377':
  Added definition/documentation for pressure sensors

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>