summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2015-04-16 08:10:02 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-16 08:10:02 +0000
commit4e788fb52a1d3ff3fb219e743ab0166bacaa33a6 (patch)
tree6d51cb08e044a92ee438f4485ca8f12bda75a5fe
parentf51e1eb133d6938576780aabfdad4a0d49d30dd2 (diff)
parent8e290d3616d7593ba0b28cdc9991882a5b6d2c81 (diff)
downloadlibnfc-nci-master-soong.tar.gz
Merge "Fix <string.h> include."master-soong
-rw-r--r--halimpl/bcm2079x/adaptation/OverrideLog.cpp1
-rw-r--r--src/adaptation/OverrideLog.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/halimpl/bcm2079x/adaptation/OverrideLog.cpp b/halimpl/bcm2079x/adaptation/OverrideLog.cpp
index b3623b1..ce40d8a 100644
--- a/halimpl/bcm2079x/adaptation/OverrideLog.cpp
+++ b/halimpl/bcm2079x/adaptation/OverrideLog.cpp
@@ -24,6 +24,7 @@
******************************************************************************/
#include "OverrideLog.h"
#include <cutils/properties.h>
+#include <string.h>
#include "config.h"
#include "android_logmsg.h"
#define LOG_TAG "NfcNciHal"
diff --git a/src/adaptation/OverrideLog.cpp b/src/adaptation/OverrideLog.cpp
index 93f2b47..d0fda56 100644
--- a/src/adaptation/OverrideLog.cpp
+++ b/src/adaptation/OverrideLog.cpp
@@ -24,6 +24,7 @@
******************************************************************************/
#include "OverrideLog.h"
#include <cutils/properties.h>
+#include <string.h>
#include "config.h"
#include "android_logmsg.h"
#define LOG_TAG "BrcmNfcJni"