summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndriy Naborskyy <andriyn@google.com>2015-11-16 19:59:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-11-16 19:59:29 +0000
commitb2e711cdbc4c348e5b1ddb42f7de4dce8492fc98 (patch)
tree4585585374722cea34ba8320a0fbc27c03365815
parent6ff827fc04e3b85791eea931904c1236763cbb40 (diff)
parent50adf5f56401c999901f9cec68dd7726e61c8ca8 (diff)
downloadsensors-b2e711cdbc4c348e5b1ddb42f7de4dce8492fc98.tar.gz
Merge "[Grant] libsensor_iio: fix build errors" into cw-e-dev
-rw-r--r--libsensors_iio/src/CircularBuffer.cpp4
-rw-r--r--libsensors_iio/src/HWSensorBase.cpp1
-rw-r--r--libsensors_iio/src/SWGravity.cpp2
-rw-r--r--libsensors_iio/src/SWLinearAccel.cpp3
-rw-r--r--libsensors_iio/src/sensor_cal.c3
5 files changed, 12 insertions, 1 deletions
diff --git a/libsensors_iio/src/CircularBuffer.cpp b/libsensors_iio/src/CircularBuffer.cpp
index d2c280e..20b4de8 100644
--- a/libsensors_iio/src/CircularBuffer.cpp
+++ b/libsensors_iio/src/CircularBuffer.cpp
@@ -8,7 +8,11 @@
*/
#include "CircularBuffer.h"
+
+#include <stdlib.h>
+#include <string.h>
#include <cutils/log.h>
+
CircularBuffer::CircularBuffer(unsigned int num_elements)
{
data_sensor = (SensorBaseData *)malloc(num_elements * sizeof(SensorBaseData));
diff --git a/libsensors_iio/src/HWSensorBase.cpp b/libsensors_iio/src/HWSensorBase.cpp
index 0e7c383..a910bd0 100644
--- a/libsensors_iio/src/HWSensorBase.cpp
+++ b/libsensors_iio/src/HWSensorBase.cpp
@@ -14,6 +14,7 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
+#include <endian.h>
#include "HWSensorBase.h"
diff --git a/libsensors_iio/src/SWGravity.cpp b/libsensors_iio/src/SWGravity.cpp
index 34362aa..6b452ab 100644
--- a/libsensors_iio/src/SWGravity.cpp
+++ b/libsensors_iio/src/SWGravity.cpp
@@ -10,6 +10,8 @@
#include <fcntl.h>
#include <assert.h>
#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
#include "SWGravity.h"
diff --git a/libsensors_iio/src/SWLinearAccel.cpp b/libsensors_iio/src/SWLinearAccel.cpp
index 2afa018..5e8163e 100644
--- a/libsensors_iio/src/SWLinearAccel.cpp
+++ b/libsensors_iio/src/SWLinearAccel.cpp
@@ -10,6 +10,9 @@
#include <fcntl.h>
#include <assert.h>
#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+
#include "SWLinearAccel.h"
diff --git a/libsensors_iio/src/sensor_cal.c b/libsensors_iio/src/sensor_cal.c
index 94fae63..5d0eb3b 100644
--- a/libsensors_iio/src/sensor_cal.c
+++ b/libsensors_iio/src/sensor_cal.c
@@ -13,9 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#include "sensor_cal.h"
+#include <errno.h>
#include <cutils/log.h>
-#include "sensor_cal.h"
/* Load sensor calibration data */
int load_cali_data(const int sindex)