summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-01-31 07:49:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-31 07:49:33 +0000
commit01da2c25c88cf45168bdf767dce1f2f65ddaf385 (patch)
tree6b3eb975b70672d61c7ee6a764dc8ad5bb4156f6
parent9f49a5982e08fa5191c7793dc7143baa974ce69d (diff)
parent4a32d6c58c39382e072887cea5fd5f66015712db (diff)
downloadmanta-01da2c25c88cf45168bdf767dce1f2f65ddaf385.tar.gz
am 4a32d6c5: Merge "Fix "error: use of undeclared identifier \'memset\'"."
* commit '4a32d6c58c39382e072887cea5fd5f66015712db': Fix "error: use of undeclared identifier 'memset'".
-rw-r--r--libsensors/IioSensorBase.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libsensors/IioSensorBase.cpp b/libsensors/IioSensorBase.cpp
index 437d095..88abae3 100644
--- a/libsensors/IioSensorBase.cpp
+++ b/libsensors/IioSensorBase.cpp
@@ -19,7 +19,9 @@
#include <fcntl.h>
#include <errno.h>
#include <cutils/log.h>
+#include <malloc.h>
#include <pthread.h>
+#include <string.h>
#include "IioSensorBase.h"